- Ros-dev - ReactOS.org

[BUG] Utterly incorrect implementation of input device coordinates.
by codeforfood＠pulseforce.com 27 Jul '09

27 Jul '09

Here's the information required to patch the incorrect implementation. Abstract: - SendInput()/NtUserSendInput() broken: --- Relative hardware mouse input "working", but not well implemented due to lack of modifying the travel distance using cursor acceleration and movement speeds (I've provided info on this as well below), input-virtual vs screen-real coordinates (even in the relative moves), etc. The two coordinate spaces are not the same thing! --- Absolute hardware mouse input broken (used by things like touchscreens), by a complete misunderstanding of how the virtual input device coordinate space works (it's NOT in ANY way a 1:1 map that's translatable to the screen, but the function uses it this way everywhere!) read below for full info since this is the serious problem. - SetCursorPos() broken (should NOT be using SendInput() since that's pointless and ineffective and is meant for the hardware input queue, we already have the desired coordinates and should move the cursor directly; and even its use of SendInput() is incorrect since it should FIRST convert the desired SCREEN coordinates to absolute-INPUT-coordinate-space), BUT since it's using the broken SendInput() (which currently doesn't know that absolute input coordinates have NOTHING to do with screen coordinates) it works correctly and will place cursors at the right location. This will have to be changed when SendInput() is patched; preferrably to a direct cursor update (elaborated in the recap below, before the log), rather than the current indirect/slow approach which places a message in the serial (as in serial-processing, first-come-first-serve) mouse-input-translation queue. So to recap: - Need to improve relative movement (to handle acceleration and mouse speed modifiers) - Need to change the code everywhere where you've been thinking that input coordinates are the same as screen coordinates (most likely only within SetCursorPos(), and SendInput()/NtUserSendInput()) - Absolute cursor placement inside SendInput() needs to be rewritten to convert absolute input-space coordinates to absolute screen-space coordinates (quite an easy change) using the algorithm I provide below, which is what Windows uses internally. - SetCursorPos() needs to COMPLETELY stop using SendInput() and instead manipulate the cursor X/Y struct directly, or equivalent methods, instead of injecting itself into the input queue. Alternatively, if it keeps using the input queue, it needs a reverse-algorithm to turn the desired screen-coordinates into virtual inputspace-coordinates, such as int mouseinput_abs_x_or_y_pos = (((65536 * screen_x_or_y_pos) / screen_width_or_height) + 1). The +1 is necessary for proper rounding. However, I see no reason to use the input queue within this function as that involves much more work than simply writing the cursor's location directly (which is what SendInput EVENTUALLY gets around to doing after LOTS of processing, and saving on cycles/jumps/calls is GOOD ;)). All details on how to fix these things are in the below log. Let me know if there's any questions. Log (most unrelated discussions/events snipped and long breaks between explaining different details have been separated with "..."): 19:56 Yewbacca . I am sure you've implemented SetCursorPos() incorrectly. Checking your source code for it at cursor.c:280. This function is SUPPOSED to take a SCREEN X/Y coordinate (ie X=1400, Y=800 on a 1440x900 screen, and then moves the cursor location directly, without emulating mouse movement. 19:57 Yewbacca . Instead, your version calls SendInput() with the x/y unmodified, that's awful. SendInput()'s absolute space is a virtual desktop square that stretches from 0-65535 in each direction and will not even be remotely close to what the intended destination is. 19:57 _0_ . sounds like a patch is in order Yewbacca 19:57 _0_ . :P 19:58 +encoded . Yewbacca, file bug report! 19:58 Yewbacca . _0_ Well I'd have to know how you're writing the cursor position inside NtSendUserInput etc. 19:58 Yewbacca . Or file a bug report, I'll do that. 20:01 Yewbacca . Related to this, Windows actually uses a slightly unexpected algorithm for its SendInput() absolute-mode coordinates-to-screen conversion. 20:01 Yewbacca . int destx_or_y = (screen_width_or_height * x_or_y_abs_coord) / 65536 20:01 Yewbacca . If you want pixel precise SendInput() that works as on windows you'd have to verify this. I'll bug report that too. 20:02 +encoded . <3 Yewbacca 20:02 Yewbacca . :) 20:02 +encoded . you can ofcourse see the source code of NtSendUserInput 20:03 Yewbacca . Yeah I was about to check that to make sure it's not already correct 20:04 +encoded . its in \subsystems\win32\win32k\ntuser\input.c 20:04 Yewbacca . Ah thanks, that saves a slow grep. 20:05 +encoded . wait opps 20:05 . garrythefish_ [n=fisher@unaffiliated/garrythefish] has joined #reactos 20:05 +encoded . oh well, nvm me 20:05 garrythefish_ . community choice award today. hope you guys win. :D 20:10 Yewbacca . Okay after brief confusion I noticed that IntMouseInput() contains the actual logic for mouse-type input to SendInput(), input.c:1081. Time to check it. ... 20:14 Yewbacca . Okay now I'm really confused. I read through IntMouseInput() from input.c:1081-1333 and unless I missed a call to a driver-coordinates-to-screen-coordinates somewhere, this function is miscoded as well. That'd mean that SetCursorPos() would work correctly since SendInput() would work incorrectly, and that normal SendInput() calls that expect a 0 to 65535 range would not work at all. 20:15 Yewbacca . It really seems to directly write the pointers for cursor X and Y with the values it has received 20:15 Yewbacca . with no conversion whatsoever 20:15 Yewbacca . even though the incoming values are in a 0 to 65535 range 20:15 Yewbacca . of that virtual space ... 20:16 Yewbacca . Basically for anyone unfamiliar with it, the driver implements a virtual space for the cursor to either move relatively within, or absolutely, to allow things like touchscreens to function easily (they'd just have to SendInput() their current position as a percentage of the 65535 range). 20:16 Yewbacca . So all incoming absolute-mode coordinates must be converted to screen coordinates, and microsoft does it with int destx_or_y = (screen_width_or_height * x_or_y_abs_coord) / 65536 20:17 Yewbacca . I'm going to re-read it again to see if I missed some conversion call. If not, that'll be 2 reports. Quite easy fixes luckily. 20:18 +encoded . <3 Yewbacca 20:18 Yewbacca . I think the reason you got by this far is because the HARDWARE mouse sends coordinates relatively 20:18 Yewbacca . The problem'd only appear with absolute input like touchscreens. And since SendInput()'s absolute mode is broken that means program's SetCursorPos() would work, so it's doubly broken and would only cause problems for absolute hardware-input (again, touchscreens mainly). 20:18 Yewbacca . :P 20:19 Yewbacca . Reading again 20:20 +encoded . Yewbacca, we can use someone like you who has knowledge of windows internals 20:20 Yewbacca . Maybe, right now I'm tied up with some major work :) ... 20:28 Yewbacca . Alright I've finished checking everything. IntMouseInput() stretches from input.c:1081-1333 and is the function that's called when NtUserSendInput()/SendInput() receives a mouse-type event. At line 1140 it grabs the pointer to the cursor's X/Y struct with IntGetCursorLocation(WinSta, &MousePos). Then we get to the significant errors. 20:29 Yewbacca . At lines 1146-1150 it incorrectly writes the virtual x/y of the INPUT coordinate system right into the memory holding the SCREEN x/y cursor location 20:30 Yewbacca . At lines 1151-1155 it handles relative movement but doesn't take into account cursor acceleration and movement speed (those settings we all love in the control panel->mouse), which in turn can increase the movement distance as much as 4 times the input value. 20:31 Yewbacca . Those two behaviours right there would need to be patched. The first should determine the destination on the screen through int destx_or_y = (screen_width_or_height * x_or_y_abs_coord) / 65536. The latter should implement handling for cursor acceleration (check MSDN, it describes acceleration on SendInput()). 20:32 Yewbacca . And lastly, SetCursorPos() (forgot which file it's in) needs to *completely* skip the SendInput() baloney that it's doing right now (http://pastebin.com/d2db76985) and just directly grab the cursor X/Y pointer and update it in a simple assignment, AFTER checking that it's in range of course (otherwise clamping it to the screen). 20:33 +Lone_Rifle . Yewbacca, suggest that you subscribe to ros-dev and retype or copy-paste your findings there, it's quite a bit of text to go through in one sitting 20:33 Yewbacca . Oh yeah and if you wanna be 100% complete, also implement a check for ClipCursor() and don't allow the cursor to move outside that, no matter if it's from hardware input or SetCursorPos(). If it's outside, it should be clamped to the nearest inside value. 20:34 Yewbacca . Lone_Rifle Yeah, I agree and was going to submit it. I'll do that now. ... 20:37 Yewbacca . Acceleration is described at http://msdn.microsoft.com/en-us/library/ms646273(VS.85).aspx (info for the MOUSEINPUT struct). I'll submit this log to the mailing list. =EOF=

2 1

[ros-diffs] [ros-arm-bringup] 42250: - Fix a ridiculous copy-paste-error-while-writing-the-commit-log error. Sorry for breaking the build!
by James Tabor 27 Jul '09

27 Jul '09

Oh, okay, I'll do the same,,,,, oh,,,,,, never mind,,,,,, I do that too.

1 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 42220: - This is a HIGH RISK patch.
by Gabriel ilardi 26 Jul '09

26 Jul '09

Hi Everyone, I've encountered this assert after restarting in 2nd stage. Rev 42235, vbox 3.0.2, "cont" lets ros continue to 3rd stage: It's not random, I've tried three times with the same result. Best regards, Gabriel. Assertion 'EndPfn == MiGetPfnEntry(Page + 1)' failed at ntoskrnl\mm\freelist.c line 301 PuTTYEntered debugger on embedded INT3 at 0x0008:0x808c1502. kdb:> bt Eip: <NTOSKRNL.EXE:c1503 (lib\rtl\i386\debug_asm.S:33 (DbgBreakPoint@0))> Frames: <NTOSKRNL.EXE:7df7e (ntoskrnl/mm/freelist.c:306 (MiFindContiguousPages@20))> <NTOSKRNL.EXE:75ef8 (ARMÂ³::CONTMEM:156 (MiFindContiguousMemory@20))> <NTOSKRNL.EXE:75fcc (ARMÂ³::CONTMEM:232 (MiAllocateContiguousMemory@20))> <NTOSKRNL.EXE:761d0 (ARMÂ³::CONTMEM:382 (MmAllocateContiguousMemorySpecifyCache@32))> <HAL.DLL:2a72> <usbdriver.sys:1610f (drivers/usb/nt4compat/usbdriver/td.c:51 (init_td_pool))> <usbdriver.sys:162c5 (drivers/usb/nt4compat/usbdriver/td.c:266 (expand_pool_list))> <usbdriver.sys:163da (drivers/usb/nt4compat/usbdriver/td.c:233 (init_td_pool_list))> <usbdriver.sys:100c9 (drivers/usb/nt4compat/usbdriver/uhci.c:1033 (uhci_init_sc edule))> <usbdriver.sys:10505 (drivers/usb/nt4compat/usbdriver/uhci.c:818 (uhci_alloc))> <usbdriver.sys:1076a (drivers/usb/nt4compat/usbdriver/uhci.c:659 (uhci_probe))> <usbdriver.sys:1082b (drivers/usb/nt4compat/usbdriver/uhci.c:3861 (DriverEntry@ ))> <NTOSKRNL.EXE:4a75b (ntoskrnl/io/iomgr/driver.c:1389 (IopCreateDriver@24))> <NTOSKRNL.EXE:49b4d (ntoskrnl/io/iomgr/driver.c:467 (@IopInitializeDriverModule 20))> <NTOSKRNL.EXE:4ac88 (ntoskrnl/io/iomgr/driver.c:1765 (IopLoadUnloadDriver@4))> <NTOSKRNL.EXE:4ae20 (ntoskrnl/io/iomgr/driver.c:1843 (NtLoadDriver@4))> <NTOSKRNL.EXE:b9afc (ntoskrnl\ke\i386\trap.s:244 (KiFastCallEntry))> <NTOSKRNL.EXE:be4a5 (obj-i386\ntoskrnl\ex\zw.S:929 (ZwLoadDriver))> <NTOSKRNL.EXE:4b3c2 (ntoskrnl/io/iomgr/drvrlist.c:540 (@IopInitializeSystemDriv rs@0))> <NTOSKRNL.EXE:d9948 (ntoskrnl/io/iomgr/iomgr.c:529 (IoInitSystem@4))> <NTOSKRNL.EXE:36846 (ntoskrnl/ex/init.c:1711 (Phase1InitializationDiscard@4))>- - Press q to abort, any other key to continue --- <NTOSKRNL.EXE:37567 (ntoskrnl/ex/init.c:1921 (Phase1Initialization@4))> <NTOSKRNL.EXE:af375 (ntoskrnl/ps/thread.c:158 (PspSystemThreadStartup@8))> <NTOSKRNL.EXE:b92f6 (ntoskrnl\ke\i386\ctxswitch.S:306 (KiThreadStartup@156))> kdb:> _________________________________________________________________ Condividi i tuoi ricordi online con chi vuoi tu. http://www.microsoft.com/italy/windows/windowslive/products/photos-share.as…

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 42225: - Begin using ws2help_new - I have tested this with various applications in ROS - Part 2 of 2
by Aleksey Bragin 26 Jul '09

26 Jul '09

That's a good first step into using proper winsock! WBR, Aleksey Bragin. On Jul 26, 2009, at 10:00 AM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Sun Jul 26 08:00:32 2009 > New Revision: 42225 > > URL: http://svn.reactos.org/svn/reactos?rev=42225&view=rev > Log: > - Begin using ws2help_new > - I have tested this with various applications in ROS > - Part 2 of 2 > > Added: > trunk/reactos/dll/win32/ws2help/ (props changed) > - copied from r42178, trunk/reactos/dll/win32/ws2help_new/ > Removed: > trunk/reactos/dll/win32/ws2help_new/

1 0

Re: [ros-dev] [ros-diffs] [sginsberg] 42218: - Fix most freeldr compilation issues, most notably: - Define structure packing correctly for msvc. - Define Ke386EraseFlags for msvc too. - Don't return a function returning void in a function returning void. - VideoFadeIn: Don't rely on some fishy gcc extension for allocating memory from the stack -- just use the heap instead. - Winldr remains
by Timo Kreuzer 26 Jul '09

26 Jul '09

sginsberg(a)svn.reactos.org schrieb: > Author: sginsberg > Date: Sat Jul 25 22:17:23 2009 > New Revision: 42218 > > URL: http://svn.reactos.org/svn/reactos?rev=42218&view=rev > Log: > - Fix most freeldr compilation issues, most notably: > - Define structure packing correctly for msvc. > - Define Ke386EraseFlags for msvc too. > hint: __writeeflags()

1 0

IServ
by Colin Finck 23 Jul '09

23 Jul '09

Hello all, Now that also the mail migration is more or less completed, let me introduce you to IServ. IServ is a Groupware solution, which we will be using now for managing E-Mail accounts, appointments, contact data and a common FTP space. It will be available to everybody, who is qualified for a @reactos.org E-Mail address. (so basically developers with SVN access and official testers) For your @reactos.org E-Mail address, IServ provides a 250 MB mailbox. You can send and receive E-Mails over the Web interface and also over POP3, IMAP and SMTP. The Web interface also offers an option to set up a redirection if you want to use another mailbox for incoming mails. Files can be uploaded either over the Web interface or over FTP. Our IServ Web interface is available at http://iserv.reactos.org. The POP3, IMAP, SMTP and FTP services can be accessed over the same domain. If you have an @reactos.org E-Mail address, but no IServ account yet, I will shortly send you your account name along with an initial password. Your account name will also serve as your primary E-Mail address from now on. (i.e. colin.finck(a)reactos.org). Of course, your previous E-Mail aliases will continue to work. They are linked to your primary address now. As most of you used a redirection from your @reactos.org address to another mailbox, I've set up these redirections in the Web interface already. You can change them anytime. A big thanks go to Martin von Wittich and the IServ GmbH, who provided us with a site license for IServ and helped us with the setup. Also thank our translators Amine Khaldi, Gabriel Ilardi and Alex/care2debug for the French, Italian, Spanish and Russian translations of the Web interface. Best regards, Colin

2 1

Let's push winetests farther!
by Jérôme Gardou 23 Jul '09

23 Jul '09

As you all know, reactos is tested against the wine test suite. While this is a great tool, I think this is not enough to be sure that ReactOS is fully tested. I've been trying to fix some kernel32 tests. As you all know, in ReactOS it is written on top of ntdll. So I wanted to fix some tests, and then a question arose : is it that kernel32 calls ntdll the wrong way, or is it that ntdll does the wrong job? The only way to verify this would be to test kernel32.dll out of reactOS, meaning replacing the windows one with the reactos one, and run the test. To be brief : I think that a weekly "reactos dlls against windows" test would be very helpful to be sure that things are done the right way! I began with the kernel32:file winetest. I managed to not make it crash when used on winXP, the resulting patch is there : http://www.reactos.org/bugzilla/show_bug.cgi?id=4728 and the result of this test is attached there. As miracles happen, it also fixes some tests on ReactOS. Seems like this is a good approach. Jérôme Gardou (aka zefklop on IRC and forums)

2 3

how can I create my own code page?
by Creatxr 22 Jul '09

22 Jul '09

hi, I have a question: how can I create my own code page? where can I get the documents about it? thanks. creatxr

3 8

Re: [ros-dev] [ros-diffs] [dchapyshev] 42012: - Samplify SwitchToThread and QueueUserWorkItem - Remove unneeded InternalWorkItemTrampoline function and QUEUE_USER_WORKITEM_CONTEXT structure - Other small changes
by Thomas Bluemel 22 Jul '09

22 Jul '09

This explains why we are using a trampoline function and not just typecast there... Is there a reason you changed this? - Thomas dchapyshev(a)svn.reactos.org wrote: > - /* NOTE: Don't use Function directly since the callback signature > - differs. This might cause problems on certain platforms... */ > - Status = RtlQueueWorkItem(InternalWorkItemTrampoline, > - WorkItemContext,

8 11

Arwinss
by Aleksey Bragin 21 Jul '09

21 Jul '09

Hello, I've heard many question about a branch I was working on recently, arwinss, so I'd like to write some explanation (you may skip the boring history part of the message) Arwinss is a rewrite (the most advanced so far out of all previous attempts) of some parts of the Win32 subsystem, namely the USER32 and GDI32 API interfaces, along with the kernel counterpart win32k.sys. The kernel32.dll, csrss, and other parts remain in their present condition, and getting bugfixes if they come in the way of a rewrite. [History and reasoning part starts here] Why rewrite and not fix an existing Win32 subsystem? Timo, James and all our other great developers were and are doing a great work. I put a considerable amount of time in it to fix problems too. But, since our project is a volunteer-driven one, everyone has a real life, real work to do, and is not able to sit 24 hrs researching Windows internal structures, inventing new algorithms, trying out thousands of applications, not to say about graphics drivers. Time is ticking, Win32 is improving, but most annoying bugs are there for years - e.g. vmware installer hang, Firefox move the mouse bug, drawing glitches, concurrency hacks in the code ("if (!a) /* someone else was faster than us and already freed it */"), probable heap misusage (relying on our heap implementation for desktop heaps) and heap memory corruptions (I kept trying to update rtl/heaps to the newest Wine code - and always failed without any obvious reason), inability to change video mode on the fly, and the list can go on. So I thought, that something should be done with it. I would even want to trade off some speed gain in favor of stability (optimizing is an enjoyable task which could be done later). After teaming up with Stefan, we created an nwin32 branch - a totally stubbed out win23k, user32 and gdi32. They had exactly matched exports, and win32k had exactly same system calls and Windows 2003 SP1's win32k.sys. However, due to really huge amount of work, the branch didn't went farther than trying to boot Windows 2003 with it and see a few stubbed functions being called. Since then I started thinking on an alternative design of a Win32 subsystem. The idea turned out to be very simple, and is based on the following questions: - Why put so much effort into keeping the internal win32k system calls interface the same as in Windows, why put so much effort in converting to internal Windows structures, if we don't have something working first? - Why base on a stoneage Wine's code which James and Christoph occasionally sync, and all my attempts to get more people into this boring task failed? - Why not use achievements of our closest project - Wine? [End of reasoning, fancy stuff starts] The result came by itself: Try to build up a win32 subsystem based as much on Wine code as possible, and using Wine's modular design. Before publicly announcing it, I have spent a month actually trying all that stuff, and surprisingly it went very well, and a nice byproduct: support of remote sessions via X Windows. Proof of concept screenshots are here: http://www.reactos.org/media/screenshots/2009/arw_xlog1.jpg http://www.reactos.org/media/screenshots/2009/arw_xlog1.jpg Noone has ever done this before: This is Windows 2003 inside VMware, running my custom Win32 subsystem, with an X graphics driver module, communicating with an X Server running in the host OS (Windows XP, XMing X windows server), and with ReactOS's winlogon.exe and msgina.dll (for ease of debugging and source code availability)! Let's go straight to the architecture: GDI32.dll and USER32.dll are ported Wine usermode code, with very few modifications. GDI32 and USER32 depend on two things: Gdi and User driver, and a server. Gdi and User driver is a loadable DLL, which provides an abstraction of a graphics driver in the system through a certain set of APIs. A typical example of such a driver is winex11.drv, which routes all drawing to the X Windows "client". However, this is not very useful for a local system which has a Windows NT architecture, where there is no need for remote windows displaying. The server. GDI32 and USER32 rely on the server for managing all global information. In Wine, the server is run as a usermode wineserver.exe process, which communicates with gdi32/user32 via custom RPC, and emulates quite a lof of stuff which Windows NT kernel provides by default. My decision was to convert the RPC protocol from a slow interprocess filedescriptors-based unix-specific invocations to a fast system calls to win32k module. This way, win32k contains small part (~300 kb vs 1.5Mb+) of wineserver's source code, which deals with windows, window classes, atoms, windows stations, desktops and other totally platform/implementation independent stuff. It will be reduced further, because I even ported their own object manager for win32 objects, which will be exchange to our native ntoskrnl's object manager soon, when the testing phase is over. The graphics driver, kernelmode part. As I said above, it's not very convinient to fully rely on X Windows for graphics output, because it's just not possible to run it in an NT-based OS which has no Win32 subsystem. Thus, I decided to create a totally native gdi/user driver ("winent.drv"), which would rely on win32k module to actually perform all drawing. However, compared to our current implementation, the drawing would be way more simple. For example, if currently LineTo operation in win32k involves complex PATHOBJ, maintaining graphics cursor -- all of that in a strictly windows compatible way because apps depend on it, in this alternative win32k, LineTo is a simple line drawing function: RosGdiLineTo(pDc, x1, y1, x2, y2). Same applies to other functions, including e.g. text output, where all rendering happens using a usermode freetype.dll, and win32k just needs to display bitmap glyphs got from gdi32. Don't be scared if you don't understand all that right away. I will put up a good short summary, along with a TODO and FIXME lists, and a HACKING guide. Just a few cool facts about the new win32 subsystem: - Based on a solid, very well maintained codebase, used by commercial vendors. - Ease of updating from upstream (vendor importing) - Tested against more than 12 000 Windows applications (http:// appdb.winehq.org) - ... I think it's enough for the first introduction. WBR, Aleksey Bragin.

7 12

Second-stage keyboard bug
by Joshua Rice 21 Jul '09

21 Jul '09

Well, after some extensive revision hunting, the strange keyboard bug some people (notably VBox users and people on RHW) has been traced to r41291 (the commit that activated USB keyboard and mice support) Now, i know this isn't an "important" bug, but it's a bug none-the-less. It's up to the devs to decide what to do with it, but i thought it was worthy of looking into. Also, rather interestingly, this bug seems to be restriced to debug builds only. The (very few) release builds i have tried seem perfectly free of this bug,which seems rather stange to me. It's getting rather late now, but i'll probably try and get a debug log of r41291 sometime tommorow, so i'm sory i can't do any more tonight. Please post here with your experience of this bug! :) Yours sincerely Joshua Rice.

3 2

Status of the server migration
by Colin Finck 21 Jul '09

21 Jul '09

Hello all, As most of you probably noticed, the downtime of the website was quite long now due to the server migration. But finally, we switched the DNS records of the ReactOS domains now, so as soon as the DNS servers around the world got the update, you should see the website again at the new server. So far, the migration only affected the Website itself. Originally, we planned to do the mail system migration as well on the same day, but ran out of time due to some unforeseen problems with the Website migration. This also means that you currently cannot send any E-Mails from our web services (such as Bugzilla and phpBB). Also the mailing list archives are currently not available. Anyway, we're going to do the mail migration in the next 24 hours and target these problems by then. After all, let's come to some advantages of the upgrade: First of all, we finally upgraded to RosCMS version 4. This version was mainly developed by Danny and went through beta testing for quite some months now. Some of the new features it provides include dependency handling (so you don't need to regenerate all pages affected by your change manually), a faster generator and a much better codebase. Secondly, there should be notably performance improvements. A component that especially benefits from them is Bugzilla. Besides, we don't use a reverse-proxy for static pages any longer. This means as much as that you don't have to press Ctrl+F5 anymore to see updated web pages, which weren't noticed by our caching proxy. Just try the Website out now and if you find any problems not mentioned here, post them to this list or try to contact Danny or me on IRC directly. Best regards, Colin

1 0

Re: [ros-dev] Arwinss
by yardkarter456＠gmail.com 20 Jul '09

20 Jul '09

Hyperion is riht here; take a look at WINE code then look at ros...WINE appears much more professional than ros code. Good luck aleksey. ------Original Message------ From: KJK::Hyperion Sender: ros-dev-bounces(a)reactos.org To: ReactOS Development List ReplyTo: ReactOS Development List Subject: Re: [ros-dev] Arwinss Sent: Jul 20, 2009 8:47 AM Timo Kreuzer wrote: > Wine emulates the kernel through a server. Of cause we don't use it, > because it has a totally different design. Says who? So far, and only counting official implementations, Win32 has been implemented as: - a shared-memory user mode subsystem (Windows 95, 98) - a RPC user mode subsystem (Windows NT 3) - a kernel mode subsystem (Windows NT 4 and later) - ??? (Windows CE) > We have an NT kernel and > every kernel developer would eat me alive if I tried to put a single > line of wine code into our kernel. It's considered crap there. Wine code has to pass quality reviews and test suites. ReactOS code only has to pass the warmth-and-fuzziness test. Wine can prove their code is right, ReactOS is based on code that feels right The idea that Wine code is better than ReactOS code really needs to die. Compared to theirs, our code is sloppy, highly unprofessional and often inexplicable. We copy the form but tend to completely miss the intent. Wine development is test-driven and entirely based on intent and end results, while our development model is, apparently, to dick around in our spare time pretending we work at Microsoft > How do you expect display drivers to work at all? NT display drivers used to run in user mode with the same identical API, and probably the same ABI. I'm sure Aleksey will do just fine > More hacks on top of the huge pile of hacks? And how do you deal with > missing functionality in wine code? Shove more code in there? Or ignore > it, like if wine doesn't need it, we also don't need it? Or again fork > the code? I would sell my mother to Carthage for even a fraction of the kind of application support that Wine enjoys, thank you. My only gripe with arwinss is that Aleksey beat me to the first landmark controversial side project _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev Sent on the Sprint® Now Network from my BlackBerry®

3 3

Web and Mail system migration
by Colin Finck 19 Jul '09

19 Jul '09

Hello, We're planning to migrate the Web and Mail system to a new server and upgrade these components in the next 24 hours. This affects the whole Website at www.reactos.org plus all @reactos.org mail addresses including the mailing lists. During the migration, these services may be temporarily unavailable. The Web server migration includes upgrading the server components (e.g. Apache, MySQL, PHP) and applications (e.g. RosCMS, phpBB) to newer versions. Besides, the configuration of the server components was tuned for a better overall performance. The mail boxes, mail relays and mailing lists will be moved to a dedicated virtual machine, which will also offer a groupware system for official ReactOS developers and testers. Our plan is to do this upgrade in two big steps, namely first the Website and afterwards the mail stuff, to keep the downtime as low as possible. Minor problems are expected after the migration and will be fixed shortly. In case of major unforeseen problems, the downtime of particular components might be extended to the next 48 hours. Best regards, Colin Finck

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 42005: - Re-implement FreeLibrary (for support LOAD_LIBRARY_AS_DATAFILE) - HeapAlloc -> RtlAllocateHeap, GetProcessHeap -> RtlGetProcessHeap, HeapFree -> RtlFreeHeap, CloseHandle -> NtClose - Remove FIXME in LoadModule
by Aleksey Bragin 19 Jul '09

19 Jul '09

I think that part you removed was right, because that is ntdll's job. Wine, for historic reasons, have this code in kernel32, which is wrong. Same applies to the LoadLibrary call. WBR, Aleksey Bragin. On Jul 17, 2009, at 9:15 PM, dchapyshev(a)svn.reactos.org wrote: > Author: dchapyshev > Date: Fri Jul 17 19:15:17 2009 > New Revision: 42005 > > URL: http://svn.reactos.org/svn/reactos?rev=42005&view=rev > Log: > - Re-implement FreeLibrary (for support LOAD_LIBRARY_AS_DATAFILE) > - HeapAlloc -> RtlAllocateHeap, GetProcessHeap -> > RtlGetProcessHeap, HeapFree -> RtlFreeHeap, CloseHandle -> NtClose > - Remove FIXME in LoadModule > > Modified: > trunk/reactos/dll/win32/kernel32/misc/ldr.c

2 1

Re: [ros-dev] [ros-diffs] [fireball] 42000: - Create a branch for upcoming work. "<XXX> people will eat you alive anyway so it doesn't really matter"
by Steven Edwards 18 Jul '09

18 Jul '09

On Fri, Jul 17, 2009 at 8:49 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Fri Jul 17 14:49:16 2009 > New Revision: 42000 > > URL: http://svn.reactos.org/svn/reactos?rev=42000&view=rev > Log: > - Create a branch for upcoming work. > > "<XXX> people will eat you alive anyway so it doesn't really matter" And your going to make children cry when people see what your doing... -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

7 12

To all gurus out there
by Johannes Anderwald 18 Jul '09

18 Jul '09

Hello, It seems to have been come a ReactOS tradition, that every 2 / 3 weeks somebody turns up on the mailing list and shows her / his _unbelievable_ exciting groundbreaking phenomenal concept which will bring us to beta and save our boring sad, depressed sucicidal lifes. I do honor your efforts, but I can only speak for myself: 1) I do coding ReactOS for fun 2) I do coding ReactOS because I enjoy the challenge Please keep your ideas for yourself unless you come up with a business plan! Thanks Johannes

3 2

On the growth of the reactos project
by Samuel serapion 18 Jul '09

18 Jul '09

Hello everyone. I find myself today thinking, as I sometimes do, about the ReactOS problem. How come we are trying to clone the biggest and arguably the most popular desktop OS in the world and still have such a small community/user base? The obvious answer to this question is that ros doesn’t do what it promises. Indeed it does almost run a lot of windows applications... some of the time, but that’s not the whole picture. Let us examine the typical(in my experience) first time encounter of a random computer user with reactos. <fanboy> Look, this is a free open source windows clone called ReactOS. It has solitaire and runs firefox. Awesome, isn’t it? <noob> so does it run my windows drivers and Office and COD4 and… !? <fanboy> well…. Umm… not really. Let’s analyze what went wrong: *1) *ReactOS base distribution is fine and great, I totally like my reactos with just a cmd window and dwnl.exe; but it’s not enough, except perhaps for someone that’s *extremely* motivated to do *something*interesting with ros. ** The solution, host a reactos distribution. I think its been proven that the reactos community doesn’t want to host more 3rd party code in the repository unless it’s absolutely necessary. But that doesn’t matter. We don’t need to build firefox, mono, or anything from source. The Windows model of software distribution is binary. There doesn’t have to be an update manager, reactos is just a toy(more on that later) and it needs to look useful so that people buy into it. Maybe a nice list of packages and some checkboxes in second stage installed with a script… 2) Hardware support is very poor, on recent hardware it almost never works(wild guess 75% fail rate on modern hardware) Problems range from unsupported video cards/ros driver uses wrong/unsupported mode, wrong storage bus, random crashes from unsupported usb devices + pcmcia other similar alien buses and just random bullshit. Even if nothing manages to bring down reactos, it of course has the wrong nic card and since usb storage doesn’t exist there’s no chance to get a driver and see ros crash because of course we only support a couple of drivers. I know this can’t just be magically fixed, but we need people dedicated to do hardware testing/debugging and provide real bug reports with traces. (Suggestion: allow kdbg to take ownership of the screen/give it back, provide visual console. I don’t care if it’s not a windows feature.) 3) Who cares about all the above? Not noobs, the question they really ask is: “Does it run XYZ?” What is XYZ? Flagship applications. The ones everyone knows and uses, commercial and opensource. The following, I think, are universally recognized as very important. a) Firefox + Flash (this works most of the time… maybe god will kill that mouse move bug) b) A recent version of Microsoft Office. (2007 would be very nice) c) Latest OpenOffice( imagine a make distro command that would tell ros setup to install it automagically, wouldn’t that make testing easier… heck we could have a super build bot that wrote documents in office and compiled shit with gcc and took 3 days to run….) d) .NET Framework (atleast 2.0) (This means fixing its installer bug) e) Java runtime. (it installs and almost launches limewire!! Christ!!) f) Visual Studio 2008 (installer fails, but the c++ compiler works and the IDE almost works!!) g) Recent versions of Adobe Photoshop, Dreamweaver or Flash. Extra points: h) Msn Messenger (its expected by windows users) i) Internet Explorer (screenshots floated around at some point with IE6, I think.. or maybe it was a dream) j) Virtual Box (with its drivers!) ( I just love the vm inside vm screenshot) k) Nmap (only pcap driver is broken!) l) Silverlight (seems to install) m) Itunes (with ipod support) (please dont be pricks about this list, make a poll or something if you must, but someone has to arbitrarily set it) The sad truth is that most of these applications are known to work to a certain degree. However, good bug reports don’t even exist. I’m confident that with a bit of determined effort these apps can be made to work. Atleast we need to compile a list of whats missing in ros that is need to support these and other important applications with real bug reports, and focus the project... give defined tasks to noobs that stumble into the project but are not knowledgable enought to dive into our huge code base and decide what are the missing features/features that need work/bugs. But really, what is the point of this email… 0.4.0 will be a milestone release(nice round number), people really want these and other similar applications to work(perhaps they are the reasons people still use windows). It makes sense to try and support them and would provide a nice PR boost if 0.4.0 can honestly be said to support any or all of the above applications. ReactOS is a developer toy, a cute little model of windows that almost works. If we can at least make it work for applications that most users actually use we could maybe, oh I don’t know… spark some interest. Yes, it’s about users, which we still won’t condone being alpha and all. But users are the ones that get excited and twitter and facebook and blog about the little OS that could; Excitement that will get developers exited, that will provide testers (I’m praying for some sort of reactos error reporting service, atleast a minidump….. atleast in usermode… support event logs…. for Christ sakes our bug reports suck and they suck10x worse when they come from noobs!). Right now we are stuck in the vm, so atleast make that experience enjoyable. There’s no need to rant about explorer, I hope… We have to start thinking about 0.5 and making reactos “beta”, and I still haven’t seen plans on how that’s going to happen or what exactly that means. ReactOS development needs to speed up and get more organized….. that’s all I have to say about that…. probably not…

9 15

Open-source and newcomers
by Alex 18 Jul '09

18 Jul '09

Hello all, Open-source and newcomers ~~~~~~~~~~~~~~~~~~~~~~~~~ I've been here for 2 weeks already and I want to share some thoughts from the point of view of a newcomer. I want to make a claim as an axiom and see where it goes from there. If you don't agree with the axiom you should probably read something on ethology and group behavior. I beg you to be open-minded. -- So the axiom is: "A closed group of humans (and many other social animals) usually is emotionally and irrationally unfriendly to newcomers, due to the evolutionary baggage we all share." The group assumes a hostile position to a newcomer. Many members don't realize what is going on. It simply feels like: "I just hate this guy!" Members, of course, feel special and somewhat better, just because they are part of the group. They see newcomers as not-worthy to some extent, just because the newcomer is not in the group. They see the newcomer as an alien and – as a threat. Subconsciously. Don't bother to reply and tell me that I am not-worthy to be seen as a threat :) The general feeling is "Who the f#ck he thinks he is? He's not from our group, he is not one of us (he didn't do anything to our project yet). Blah-blah-blah... I just hate this guy!". This irrational hate is very tangible, believe me. It is very de-motivational. (And I probably shouldn't have reacted the way I did to some of it, but, hey, I am no Jesus Christ, and it's only now that I've sorted those things out for myself). But you can say: Hey, we are not hostile, because: - "I, personally, entered the group in the past and it was Ok." - "Look at that guy and that guy – we were soooo nice to them!" Let's see... When can a closed group readily accept a newcomer? When it doesn't perceive him as a threat. This means the newcomer must come in a very submissive pose and exhibit not a slightest sign of aggressive attitude. Actually, the more you cry for mercy, the more chances are that you will be easily accepted into the group. Broken leg or being a total looser may help, as compassion will start to overtake the initial hostility. The "pose" on the text-based Internet is mainly how one talks. This is an example of a submissive pose: "Oh, Great Lords, you are so cool and I am not worthy. I beg you to let me develop for ReactOS, I am not much, but I will dutifully learn from you, Wise Masters, I will catch every word you say and ignore any insults you will throw my way. I will not criticize you in any way. I will do all the shitty tasks silently and obediently for several years until I slowly climb your social ladder. I will not complain of being called stupid and not-worthy 'cause that's who I am..." And so it goes... An ass-kisser, to be short. And then the Wise Great Masters will generously allow this no-worthy worm into their Temple. This happens everywhere. Just take a closer look. -- But this constitutes a problem. The group acts as a filter that favors the wrong kind of people. Because a good developer, after all, is usually opinionated, criticizes what he thinks is wrong, doesn't like to be called stupid and be given insults and shitty tasks. He challenges existing routines and things the group got used to. He is a threat. -- Unfortunately, I do not have a solution. I just want to attract your attention to it. P.S. You may ask – didn't you think that this hostility is a consequence of you being a jerk? If being a jerk means not kissing asses of Great Masters – then yeah, I may be guilty of that. P.P.S. Before posting a reply, please take a look inside you and try to see if that reply is based on "I just hate this guy!" :) Thanks! -- Best regards, Alex mailto:care2debug@gmail.com

8 10

Very nice.
by Alex 17 Jul '09

17 Jul '09

Hello ReactOS, I am not sure if this is an appropriate place to write, but someone with the name Physicus has banned me from the #reactos channel, because he doesn't know physics and is ignorant enough. Ok, you want to stay ignorant - it's your life choice. But what right does he have to ban me from _reactos_ channel? So now I can't develop for ROS, just because one guy is closed-minded about his view of physics?!! Is it how you treat people around here? No wonder you have such a small number of developers... Human stupidity and arrogance has certainly no limits... -- Best regards, Alex mailto:care2debug@gmail.com

10 10

Re: [ros-dev] [ros-diffs] [jimtabor] 41994: - Fix fixed math, thanks Lentin.
by Timo Kreuzer 16 Jul '09

16 Jul '09

jimtabor(a)svn.reactos.org wrote: > Author: jimtabor > Date: Thu Jul 16 21:34:42 2009 > New Revision: 41994 > > URL: http://svn.reactos.org/svn/reactos?rev=41994&view=rev > Log: > - Fix fixed math, thanks Lentin. > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/class.c > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Jul 16 21:34:42 2009 > @@ -61,7 +61,7 @@ > { > int i; > > - for ( i = 0; i < 10; i++) > + for ( i = 0; i < 11; i++) > { > if (FnidToiCls[i].FnId == FnId) > { > Isn't there a constant for this?

2 1

Re: [ros-dev] Very nice.
by WaxDragon 16 Jul '09

16 Jul '09

#reactos is not ##physics, so you weren't on topic. If this email is an example of your behaviour, I probably would have banned you too. -WD On Jul 15, 2009 7:30 PM, "Alex" <care2debug(a)gmail.com> wrote: Hello ReactOS, I am not sure if this is an appropriate place to write, but someone with the name Physicus has banned me from the #reactos channel, because he doesn't know physics and is ignorant enough. Ok, you want to stay ignorant - it's your life choice. But what right does he have to ban me from _reactos_ channel? So now I can't develop for ROS, just because one guy is closed-minded about his view of physics?!! Is it how you treat people around here? No wonder you have such a small number of developers... Human stupidity and arrogance has certainly no limits... -- Best regards, Alex mailto:care2debug@gmail.com _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

2 1

Re: [ros-dev] [ros-diffs] [janderwald] 41970: - Interrupt is only shareable if the type is latched
by Dmitry Gorbachev 15 Jul '09

15 Jul '09

> (Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) Is this right? ReactOS' KeConnectInterrupt() does not support interrupts edge-triggered and shared.

3 3

SVN to be down
by Aleksey Bragin 13 Jul '09

13 Jul '09

Hello, SVN server is going to be down for some time within the next 24hrs due to transfer to another datacenter. Minor problems after the transfer are expected and will be fixed appropriately. Thanks for your patience. WBR, Aleksey Bragin.

1 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 41863: stop building ntdll as a win32dll so we can fucking stop auto-importing mingw_common and kernel32 into it... it's supposed to be built as a /SUBSYSTEM:WINDOWS dll but since rbuild has now decided to fuck around with these DLLs, it's safer to build it as native so it can be left the fuck alone and not auto-import half the tree
by KJK::Hyperion 12 Jul '09

12 Jul '09

ros-arm-bringup(a)svn.reactos.org wrote: > stop building ntdll as a win32dll so we can fucking stop auto-importing mingw_common and kernel32 into it... if you need any rbuild features or fixes, just ask me > it's supposed to be built as a /SUBSYSTEM:WINDOWS dll not even that, it's a DLL built with a subsystem of CONSOLE! (no idea why, what the hell, Microsoft?) which rbuild can't currently express in any way but <linkerflag>. Do you need a "subsystem" attribute for modules, maybe? Knock the table once for "no", twice for "yes"

2 1

Regression in ros-arm-bringup team commit 41861
by Olaf Siejka 11 Jul '09

11 Jul '09

Commit: use %zd for SIZE_T, not just %d File affected: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Replication: clean build, then try to make. Rbuild throws an unhandled exception: Faulting application rbuild.exe, version 0.0.0.0, time stamp 0x4a58b510, faulting module msvcrt.dll, version 7.0.6002.18005, time stamp 0x49e0379e, exception code 0xc0000005, fault offset 0x0000e461, process id 0x164c, application start time 0x01ca023f7e2b558b. when creating makefile.auto: BASEADDRESS_WININET := 0x70200000 BASEADDRESS_WINMM := 0x697d0000 BASEADDRESS_WINSCARD := 0x723d0000 BASEADDRESS_WINSPOO Please fix or revert the blamed revision, as it breaks buildint on Windows.

1 0

Installation is broken after r41859
by Dmitry Chapyshev 11 Jul '09

11 Jul '09

After r41859 installation in vmware (6.5) does not work. Log: (ntoskrnl\kd\kdio.c:220) ----------------------------------------------------- (ntoskrnl\kd\kdio.c:221) ReactOS 0.4-SVN (Build 20090711-r41859) (ntoskrnl\kd\kdio.c:222) Command Line: NOGUIBOOT DEBUGPORT=COM1 NOGUIBOOT DEBUGPORT=COM1 (ntoskrnl\kd\kdio.c:223) ARC Paths: multi(0)disk(0)cdrom(159) \ multi(0)disk(0)cdrom(159) \reactos\ Used memory 523828Kb (ntoskrnl\mm\mminit.c:183) Start End Type (ntoskrnl\mm\mminit.c:184) 0x80000000 - 0x80E00000 Boot Image Mapping Region (ntoskrnl\mm\mminit.c:187) 0x80E00000 - 0x81100000 PFN Database region (ntoskrnl\mm\mminit.c:190) 0x81100000 - 0x87500000 Non paged pool region (ntoskrnl\mm\mminit.c:193) 0x87500000 - 0x8D900000 Paged pool region (ARM³::INIT:504) 0xB0000000 - 0xB0300000 Shadow PFN Database (ARM³::INIT:509) 0xB0300000 - 0xB1318000 ARM Non Paged Pool (ARM³::INIT:583) 0xF3400000 - 0xF8BF8000 System PTE Space (ARM³::INIT:586) 0xF8BF8000 - 0xFFBE0000 Non Paged Pool Expansion PTE Space (ARM³::POOL:265) Out of NP Pool (ARM³::POOL:393) Start of of initial frame (ARM³::POOL:332) End of initial frame [7hEntered debugger on last-chance exception (Exception Code: 0xc0000005) (Page Fault) Memory at 0x00000000 could not be written: Page not present. kdb:> bt Eip: <b0309000> Frames: <00000000> kdb:> -- WBR, Dmitry Chapyshev

1 0

why wasnt ReactOS invited to GSoC? here is the answer....
by Javier Agustìn Fernàndez Arroyo 10 Jul '09

10 Jul '09

Seems that Google plans to release a "Chrome platform" to desktop pc´s http://www.elmundo.es/elmundo/2009/07/08/navegante/1247044337.html curse them

5 5

Re: [ros-dev] [ros-diffs] [hyperion] 41815: modified lib/pseh/i386/framebased-gcchack.c Notorious ass-clown Arch Blackmann forgot to pop the trylevel that handled an exception. Subsequent throws would keep being caught by the same trylevel over and o
by Dmitry Gorbachev 08 Jul '09

08 Jul '09

Thanks to all!

2 2

Re: [ros-dev] [ros-diffs] [hyperion] 41815: modified lib/pseh/i386/framebased-gcchack.c Notorious ass-clown Arch Blackmann forgot to pop the trylevel that handled an exception. Subsequent throws would keep being caught by the same trylevel over and over again, and infinite loops are indeed possible. Eat shit and die, Arch If test_bug_4663 test in the PSEH2 test suite is actually representative of the bug, the bug itself may have been fixed
by KJK::Hyperion 08 Jul '09

08 Jul '09

hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Thu Jul 9 00:32:50 2009 > New Revision: 41815 This should fix the bug exposed by ARM3 and hackfixed by hto (see #4663). I was in a hurry when I committed and I forgot to thank Stefan for providing the regression test that was fundamental to fixing both this issue and the previous PSEH2 bug

1 0

Re: [ros-dev] [ros-diffs] [weiden] 41805: Allow activating tasks
by KJK::Hyperion 08 Jul '09

08 Jul '09

weiden(a)svn.reactos.org wrote: > Modified: > trunk/reactos/base/shell/explorer-new/taskswnd.c Godspeed, three thumbs up. Make us proud

1 0

Re: [ros-dev] Ros-dev Digest, Vol 59, Issue 11
by Olaf Siejka 08 Jul '09

08 Jul '09

On the other hand, this PSEH bug has locked up our buildbot for a considerable amount of time. I have no intention to promote hacking or hiding bugs, on the other hand though, the longer we run without debug buildbot, the more regressions and other problems are potentially going unnoticed. This was my major concern over so called MDL probe or as we now know - PSEH2 bug issue.

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 41788: "Fix" MDL PROBE FAILED! bug #4663.
by Alex Ionescu 08 Jul '09

08 Jul '09

I'm confused... I've looked through the code, and I don't get what the "Break" does here. Does the ExRaiseStatus somehow end up handled in this path again? That means there's a serious SEH2 bug. On 6-Jul-09, at 11:28 AM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Mon Jul 6 22:28:11 2009 > New Revision: 41788 > > URL: http://svn.reactos.org/svn/reactos?rev=41788&view=rev > Log: > "Fix" MDL PROBE FAILED! bug #4663. > > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Mon Jul 6 > 22:28:11 2009 > @@ -679,6 +679,7 @@ > // Oops :( > // > ProbeStatus = _SEH2_GetExceptionCode(); > + _SEH2_YIELD(break); > } > _SEH2_END; > > Best regards, Alex Ionescu

5 9

Code hacking rules, currently applying for NTOSKRNL
by Aleksey Bragin 07 Jul '09

07 Jul '09

I decided to make this as a separate post, though it's a follow up to the previous one. I would like to set, officially, a couple of simple code hacking rules, which are going to apply immediately for the NTOSKRNL module, and to other modules after discussion/acceptance. They apply only to committers (which commit their own or someone else's patches). 1. If you change someone's code, and believe it's a correct change - go ahead and commit. 2. If you need to add a hack to someone's code, and: 2.1. you want to either hack or revert the offending commit which breaks booting: This is allowed only after 24hrs after trying to contact the author / posting to the ros-dev mailing list about the problem. 2.2. you want to either hack or revert the offending commit which contains a certain regression but doesn't cause important consequences like inability to install the OS, or major loss of functionality: This is allowed only from permission of author of the code which you want to hack or, as alternative, from my permission. I think this way we can get some order into the coming commits flow, which is hard to track. Also, please comment on this, so that we can alter those rules and maybe accept them for all modules. Thanks for understanding, Aleksey Bragin.

3 3

ReactOS 3.1.0... what???
by Javier Agustìn Fernàndez Arroyo 07 Jul '09

07 Jul '09

hi guys, if you see latest compatibility database entries you will note that reported ROS version is 3.1.0 why? any clue? some examples: http://www.reactos.org/support/index.php?page=db&view=comp&sec=category&ite… http://www.reactos.org/support/index.php?page=db&view=comp&sec=category&ite…

2 1

Re: [ros-dev] [ros-diffs] [cgutman] 41783: - Fix return value of tdiGetMibForIfEntity so it doesn't return a failure status on success
by Ged 07 Jul '09

07 Jul '09

This looks hackish It also breaks the log as you're potentially returning something different from what the log states -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cgutman(a)svn.reactos.org Sent: 06 July 2009 08:54 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cgutman] 41783: - Fix return value of tdiGetMibForIfEntity so it doesn't return a failure status on success Author: cgutman Date: Mon Jul 6 11:54:28 2009 New Revision: 41783 URL: http://svn.reactos.org/svn/reactos?rev=41783&view=rev Log: - Fix return value of tdiGetMibForIfEntity so it doesn't return a failure status on success Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Mon Jul 6 11:54:28 2009 @@ -280,7 +280,7 @@ entry->ent.if_descr); TRACE("} status %08x\n",status); - return status; + return STATUS_SUCCESS; } NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile,

3 4

Re: [ros-dev] [ros-diffs] [dgorbachev] 41788: "Fix" MDL PROBE FAILED! bug #4663.
by Aleksey Bragin 06 Jul '09

06 Jul '09

Uhm, why hack the kernel again? Testing on the buildbot was fixed to accept this, so there is no urge. I was just trying to help RPG to find the issue, along with vmware/vbox video drivers regression, due to a MmMapIoSpace(128Mb) call. Please read the next email. WBR, Aleksey. On Jul 6, 2009, at 10:28 PM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Mon Jul 6 22:28:11 2009 > New Revision: 41788 > > URL: http://svn.reactos.org/svn/reactos?rev=41788&view=rev > Log: > "Fix" MDL PROBE FAILED! bug #4663.

2 1

Re: [ros-dev] [ros-diffs] [dgorbachev] 41788: "Fix" MDL PROBE FAILED! bug #4663.
by KJK::Hyperion 06 Jul '09

06 Jul '09

dgorbachev(a)svn.reactos.org wrote: > --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Mon Jul 6 22:28:11 2009 > @@ -679,6 +679,7 @@ > // Oops :( > // > ProbeStatus = _SEH2_GetExceptionCode(); > + _SEH2_YIELD(break); > } > _SEH2_END; What's that supposed to do?

1 0

Re: [ros-dev] [ros-diffs] [jimtabor] 41776: - Implement the client shutdown procedure. Tested with wine user32 msg undocumented 0x3B tests. Wine tests: msg: 6175 tests executed (0 marked as todo, 937 failures), 5 skipped. - Add missing end session types. - Reference: winproc.c WM_CLIENTSHUTDOWN http://wiki.winprog.org/wiki/Windows_messages
by Timo Kreuzer 05 Jul '09

05 Jul '09

jimtabor(a)svn.reactos.org schrieb: > Author: jimtabor > Date: Sun Jul 5 06:21:35 2009 > New Revision: 41776 > > URL: http://svn.reactos.org/svn/reactos?rev=41776&view=rev > Log: > - Implement the client shutdown procedure. Tested with wine user32 msg undocumented 0x3B tests. Wine tests: msg: 6175 tests executed (0 marked as todo, 937 failures), 5 skipped. > - Add missing end session types. > - Reference: winproc.c WM_CLIENTSHUTDOWN http://wiki.winprog.org/wiki/Windows_messages > > [...] > > + List = IntWinListChildren(pWindow); > Oh, how I loathe this function. It walks through the chain of windows to count them, allocates a buffer from paged pool. Walks through the chain again, fills the buffer with the windows' handles and returns the buffer so that the calling function can walk through the buffer and use the handles to query the pointers to the windows again. And this all happens while holding the global user lock. Hint: you can remove 11 lines of code and change 2 lines and get the same result, only faster. Regards, Timo

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 41755: - Fixes return values for PeekMessageA/W
by Steven Edwards 05 Jul '09

05 Jul '09

On Fri, Jul 3, 2009 at 5:53 AM, <dchapyshev(a)svn.reactos.org> wrote: > - if (-1 == (int) Res || ! Res) > - { > - return Res; > + if (-1 == (int) Res || !Res) > + { > + return FALSE; I know you didn't write the check and were just changing the return values but as a matter of style could we do something like if (((int) Res || !Res) == -1) or would the extra parens mess up the order of operations? Not a big deal, its just easier on my eyes. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 2

Commit log
by Ged 05 Jul '09

05 Jul '09

I think we all agree that the process of filling out a changelog is a task we would rather avoid. Collibri has made some efforts to alleviate this and despite getting some good results we're also seeing a lot of information which isn't changelog oriented. This now leaves us with a new problem of having to manually go through data output from Collibri's tool and reformat it. This is arguably more time consuming than the original method and isn't working for us in its current form. The current problem with this method is that a commit log is not a changelog and getting something which can be classed as a changelog from this without human intervention is an impossible task. There are also some people who would rather write their own changelog instead of allowing a tool to generate it for you. The problem as I see it is two fold : - Commit messages generally contain cryptic message, humour, idioms and frustration - Patches can spread over a wide range of modules making it difficult to insert them into the correct position in the changelog. A possible solution to this is to wrap up a changelog in XML elements. Such a commit log would be as follows : ............................................................................ .......................... - Stop mixing unicode and ANSI strings - Don't dereference NULL pointers <changelog> <notepad>Converted the application to Unicode</notepad> <user32>Fixed a crash highlighted via adobe acrobat</user32> </changelog> ............................................................................ .......................... This will allow anyone who wants to have a changelog autogenerated at release time to take advantage and anyone who wants to do their own to ignore it. The problem with this method lies in getting the XML tags correct. Anyone have any other ideas? Ged.

11 15

Re: [ros-dev] Ros-dev Digest, Vol 59, Issue 3
by Olaf Siejka 02 Jul '09

02 Jul '09

Sorry for not deleting the post content:/ Back to sysreg... i`d issue a deadline, like 24-48h and until then i`d lock the trunk. If this issue is not fixed until the deadline, offending revision should be reverted and trunk unfrozen. I can only hope we arent getting many regressions in the meantime.

1 0

Regression after ARM commit
by Olaf Siejka 02 Jul '09

02 Jul '09

Hiya Revision 41657 introduces a regression with VirtualBox Guest Additions video driver. Please see http://www.reactos.org/bugzilla/show_bug.cgi?id=4650 for more details. Regards 2009/7/2 <ros-dev-request(a)reactos.org> > Send Ros-dev mailing list submissions to > ros-dev(a)reactos.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.reactos.org/mailman/listinfo/ros-dev > or, via email, send a message with subject or body 'help' to > ros-dev-request(a)reactos.org > > You can reach the person managing the list at > ros-dev-owner(a)reactos.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Ros-dev digest..." > > > Today's Topics: > > 1. Re: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using marlett font. - See issue #4450 for details. (Ged) > 2. Re: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using marlett font. - See issue #4450 for details. (James Tabor) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Wed, 1 Jul 2009 23:10:03 +0100 > From: "Ged" <gedmurphy(a)gmail.com> > Subject: Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using > marlett font. - See issue #4450 for details. > To: <ros-dev(a)reactos.org> > Message-ID: <001801c9fa98$af921810$0eb64830$@com> > Content-Type: text/plain; charset="utf-8" > > Did you read this patch before committing it? > Your last patch fixed tchar usage and then this next patch introduces new > ones. > > > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of mkupfer(a)svn.reactos.org > Sent: 01 July 2009 22:57 > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT > gmail DOT com> - Add symbols to system menu by using marlett font. - See > issue #4450 for details. > > Author: mkupfer > Date: Thu Jul 2 01:56:44 2009 > New Revision: 41733 > > URL: http://svn.reactos.org/svn/reactos?rev=41733&view=rev > Log: > Mikhail Denisenko <denisenkom AT gmail DOT com> > - Add symbols to system menu by using marlett font. > - See issue #4450 for details. > > Modified: > trunk/reactos/dll/win32/user32/windows/menu.c > > Modified: trunk/reactos/dll/win32/user32/windows/menu.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… > > ============================================================================== > --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Jul 2 > 01:56:44 2009 > @@ -42,7 +42,6 @@ > #define IS_SYSTEM_POPUP(MenuInfo) \ > (0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & > MF_SYSMENU)) > > -#define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) > #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && > ((INT_PTR)(id) >= -1)) > > #define MENU_ITEM_HBMP_SPACE (5) > @@ -307,7 +306,7 @@ > Size->cx = Size->cy = 0; > > /* check if there is a magic menu item associated with this item */ > - if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) > + if (IS_MAGIC_BITMAP(Bmp)) > { > switch((INT_PTR) Bmp) > { > @@ -339,18 +338,15 @@ > case (INT_PTR) HBMMENU_MBAR_CLOSE: > case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: > case (INT_PTR) HBMMENU_MBAR_CLOSE_D: > + case (INT_PTR) HBMMENU_POPUP_CLOSE: > + case (INT_PTR) HBMMENU_POPUP_RESTORE: > + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > /* FIXME: Why we need to subtract these magic values? */ > /* to make them smaller than the menu bar? */ > Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; > Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; > return; > - case (INT_PTR) HBMMENU_POPUP_CLOSE: > - case (INT_PTR) HBMMENU_POPUP_RESTORE: > - case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > - case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > - default: > - FIXME("Magic menu bitmap not implemented\n"); > - return; > } > } > > @@ -359,6 +355,70 @@ > Size->cx = Bm.bmWidth; > Size->cy = Bm.bmHeight; > } > +} > + > +/*********************************************************************** > + * MenuDrawPopupGlyph > + * > + * Draws popup magic glyphs (can be found in system menu). > + */ > +static void FASTCALL > +MenuDrawPopupGlyph(HDC dc, LPRECT r, INT_PTR popupMagic, BOOL inactive, > BOOL hilite) > +{ > + LOGFONTW lf; > + HFONT hFont, hOldFont; > + COLORREF clrsave; > + INT bkmode; > + TCHAR symbol; > + switch (popupMagic) > + { > + case (INT_PTR) HBMMENU_POPUP_RESTORE: > + symbol = '2'; > + break; > + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > + symbol = '0'; > + break; > + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > + symbol = '1'; > + break; > + case (INT_PTR) HBMMENU_POPUP_CLOSE: > + symbol = 'r'; > + break; > + default: > + ERR("Invalid popup magic bitmap %d\n", (int)popupMagic); > + return; > + } > + ZeroMemory(&lf, sizeof(LOGFONTW)); > + InflateRect(r, -2, -2); > + lf.lfHeight = r->bottom - r->top; > + lf.lfWidth = 0; > + lf.lfWeight = FW_NORMAL; > + lf.lfCharSet = DEFAULT_CHARSET; > + lstrcpy(lf.lfFaceName, TEXT("Marlett")); > + hFont = CreateFontIndirect(&lf); > + /* save font and text color */ > + hOldFont = SelectObject(dc, hFont); > + clrsave = GetTextColor(dc); > + bkmode = GetBkMode(dc); > + /* set color and drawing mode */ > + SetBkMode(dc, TRANSPARENT); > + if (inactive) > + { > + /* draw shadow */ > + if (!hilite) > + { > + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); > + TextOut(dc, r->left + 1, r->top + 1, &symbol, 1); > + } > + } > + SetTextColor(dc, GetSysColor(inactive ? COLOR_GRAYTEXT : (hilite ? > COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT))); > + /* draw selected symbol */ > + TextOut(dc, r->left, r->top, &symbol, 1); > + /* restore previous settings */ > + SetTextColor(dc, clrsave); > + SelectObject(dc, hOldFont); > + SetBkMode(dc, bkmode); > + DeleteObject(hFont); > } > > /*********************************************************************** > @@ -382,7 +442,7 @@ > Bmp = hbmpToDraw; > > /* Check if there is a magic menu item associated with this item */ > - if (IS_MAGIC_ITEM(hbmpToDraw)) > + if (IS_MAGIC_BITMAP(hbmpToDraw)) > { > UINT Flags = 0; > RECT r; > @@ -459,8 +519,7 @@ > case (INT_PTR) HBMMENU_POPUP_RESTORE: > case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: > case (INT_PTR) HBMMENU_POPUP_MINIMIZE: > - default: > - FIXME("Magic menu bitmap not implemented\n"); > + MenuDrawPopupGlyph(Dc, &r, (INT_PTR)hbmpToDraw, Item->fState & > MF_GRAYED, Item->fState & MF_HILITE); > return; > } > InflateRect(&r, -1, -1); > @@ -736,9 +795,17 @@ > checked = TRUE; > } > } > - if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & > MNS_CHECKORBMP))) > + if (Item->hbmpItem) > { > - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, > Action, MenuBar); > + RECT bmpRect; > + CopyRect(&bmpRect, &Rect); > + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & > MNS_NOCHECK)) > + bmpRect.left += CheckBitmapWidth + 2; > + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) > + { > + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; > + MenuDrawBitmapItem(Dc, Item, &bmpRect, MenuInfo->Self, WndOwner, > Action, MenuBar); > + } > } > /* Draw the popup-menu arrow */ > if (0 != (Item->fType & MF_POPUP)) > @@ -767,7 +834,9 @@ > UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE > : DT_LEFT | DT_VCENTER | DT_SINGLELINE; > > - if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) > + if(MenuInfo->dwStyle & MNS_CHECKORBMP) > + Rect.left += max(0, MenuInfo->maxBmpSize.cx - > GetSystemMetrics(SM_CXMENUCHECK)); > + else > Rect.left += MenuInfo->maxBmpSize.cx; > > if (0 != (Item->fState & MFS_DEFAULT)) > @@ -779,11 +848,6 @@ > { > Rect.left += MENU_BAR_ITEMS_SPACE / 2; > Rect.right -= MENU_BAR_ITEMS_SPACE / 2; > - } > - if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != > 0 ) > - { > - Rect.left += MenuInfo->maxBmpSize.cx; > - Rect.right -= MenuInfo->maxBmpSize.cx; > } > > Text = (PWCHAR) Item->dwTypeData; > @@ -1103,8 +1167,30 @@ > NTSTATUS WINAPI > User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength) > { > - LRESULT Result; > - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); > + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); > + LRESULT Result = (LRESULT)hmenu; > + > + // removing space for checkboxes from menu > + MENUINFO menuinfo = {0}; > + menuinfo.cbSize = sizeof(menuinfo); > + menuinfo.fMask = MIM_STYLE; > + GetMenuInfo(hmenu, &menuinfo); > + menuinfo.dwStyle |= MNS_NOCHECK; > + SetMenuInfo(hmenu, &menuinfo); > + > + // adding bitmaps to menu items > + MENUITEMINFOW info = {0}; > + info.cbSize = sizeof(info); > + info.fMask |= MIIM_BITMAP; > + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; > + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_RESTORE; > + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; > + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); > + info.hbmpItem = HBMMENU_POPUP_CLOSE; > + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); > + > return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); > } > > @@ -1247,7 +1333,6 @@ > MenuInfo->maxBmpSize.cy = abs(Size.cy); > } > MenuSetRosMenuInfo(MenuInfo); > - ItemInfo->Rect.right += Size.cx + 2; > itemheight = Size.cy + 2; > > if( !(MenuInfo->dwStyle & MNS_NOCHECK)) > > > > > ------------------------------ > > Message: 2 > Date: Wed, 1 Jul 2009 20:26:20 -0500 > From: James Tabor <jimtabor.rosdev(a)gmail.com> > Subject: Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko > <denisenkom AT gmail DOT com> - Add symbols to system menu by > using > marlett font. - See issue #4450 for details. > To: ReactOS Development List <ros-dev(a)reactos.org> > Message-ID: > <b93fa9340907011826s2b31d0d3va7674a0446a00020(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1 > > Hi! > > On Wed, Jul 1, 2009 at 5:10 PM, Ged<gedmurphy(a)gmail.com> wrote: > > Did you read this patch before committing it? > > Your last patch fixed tchar usage and then this next patch introduces new > ones. > > > > > Looks okay, interesting way for setting up the system menu for kernel > space. Need to test this with every application in our test library to > make sure this all works! > > > @@ -1103,8 +1167,30 @@ > > NTSTATUS WINAPI > > User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG > ArgumentLength) > > { > > - LRESULT Result; > > - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); > > + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); > > + LRESULT Result = (LRESULT)hmenu; > > + > > + // removing space for checkboxes from menu > > + MENUINFO menuinfo = {0}; > > + menuinfo.cbSize = sizeof(menuinfo); > > + menuinfo.fMask = MIM_STYLE; > > + GetMenuInfo(hmenu, &menuinfo); > > + menuinfo.dwStyle |= MNS_NOCHECK; > > + SetMenuInfo(hmenu, &menuinfo); > > + > > + // adding bitmaps to menu items > > + MENUITEMINFOW info = {0}; > > + info.cbSize = sizeof(info); > > + info.fMask |= MIIM_BITMAP; > > + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; > > + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_RESTORE; > > + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; > > + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); > > + info.hbmpItem = HBMMENU_POPUP_CLOSE; > > + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); > > + > > return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); > > } > > > > > ------------------------------ > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > End of Ros-dev Digest, Vol 59, Issue 2 > ************************************** >

1 0

testing on buildserver is broken
by Christoph von Wittich 02 Jul '09

02 Jul '09

hangs with endless ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED! (ARM³::MDLSUP:692) MDL PROBE FAILED!

5 5

Re: [ros-dev] [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details.
by Ged 02 Jul '09

02 Jul '09

Did you read this patch before committing it? Your last patch fixed tchar usage and then this next patch introduces new ones. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 01 July 2009 22:57 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 41733: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details. Author: mkupfer Date: Thu Jul 2 01:56:44 2009 New Revision: 41733 URL: http://svn.reactos.org/svn/reactos?rev=41733&view=rev Log: Mikhail Denisenko <denisenkom AT gmail DOT com> - Add symbols to system menu by using marlett font. - See issue #4450 for details. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Thu Jul 2 01:56:44 2009 @@ -42,7 +42,6 @@ #define IS_SYSTEM_POPUP(MenuInfo) \ (0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU)) -#define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define MENU_ITEM_HBMP_SPACE (5) @@ -307,7 +306,7 @@ Size->cx = Size->cy = 0; /* check if there is a magic menu item associated with this item */ - if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp))) + if (IS_MAGIC_BITMAP(Bmp)) { switch((INT_PTR) Bmp) { @@ -339,18 +338,15 @@ case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: case (INT_PTR) HBMMENU_MBAR_CLOSE_D: + case (INT_PTR) HBMMENU_POPUP_CLOSE: + case (INT_PTR) HBMMENU_POPUP_RESTORE: + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: /* FIXME: Why we need to subtract these magic values? */ /* to make them smaller than the menu bar? */ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; - case (INT_PTR) HBMMENU_POPUP_CLOSE: - case (INT_PTR) HBMMENU_POPUP_RESTORE: - case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: - case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); - return; } } @@ -359,6 +355,70 @@ Size->cx = Bm.bmWidth; Size->cy = Bm.bmHeight; } +} + +/*********************************************************************** + * MenuDrawPopupGlyph + * + * Draws popup magic glyphs (can be found in system menu). + */ +static void FASTCALL +MenuDrawPopupGlyph(HDC dc, LPRECT r, INT_PTR popupMagic, BOOL inactive, BOOL hilite) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + INT bkmode; + TCHAR symbol; + switch (popupMagic) + { + case (INT_PTR) HBMMENU_POPUP_RESTORE: + symbol = '2'; + break; + case (INT_PTR) HBMMENU_POPUP_MINIMIZE: + symbol = '0'; + break; + case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: + symbol = '1'; + break; + case (INT_PTR) HBMMENU_POPUP_CLOSE: + symbol = 'r'; + break; + default: + ERR("Invalid popup magic bitmap %d\n", (int)popupMagic); + return; + } + ZeroMemory(&lf, sizeof(LOGFONTW)); + InflateRect(r, -2, -2); + lf.lfHeight = r->bottom - r->top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); + if (inactive) + { + /* draw shadow */ + if (!hilite) + { + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + TextOut(dc, r->left + 1, r->top + 1, &symbol, 1); + } + } + SetTextColor(dc, GetSysColor(inactive ? COLOR_GRAYTEXT : (hilite ? COLOR_HIGHLIGHTTEXT : COLOR_MENUTEXT))); + /* draw selected symbol */ + TextOut(dc, r->left, r->top, &symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); } /*********************************************************************** @@ -382,7 +442,7 @@ Bmp = hbmpToDraw; /* Check if there is a magic menu item associated with this item */ - if (IS_MAGIC_ITEM(hbmpToDraw)) + if (IS_MAGIC_BITMAP(hbmpToDraw)) { UINT Flags = 0; RECT r; @@ -459,8 +519,7 @@ case (INT_PTR) HBMMENU_POPUP_RESTORE: case (INT_PTR) HBMMENU_POPUP_MAXIMIZE: case (INT_PTR) HBMMENU_POPUP_MINIMIZE: - default: - FIXME("Magic menu bitmap not implemented\n"); + MenuDrawPopupGlyph(Dc, &r, (INT_PTR)hbmpToDraw, Item->fState & MF_GRAYED, Item->fState & MF_HILITE); return; } InflateRect(&r, -1, -1); @@ -736,9 +795,17 @@ checked = TRUE; } } - if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + if (Item->hbmpItem) { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + RECT bmpRect; + CopyRect(&bmpRect, &Rect); + if (!(MenuInfo->dwStyle & MNS_CHECKORBMP) && !(MenuInfo->dwStyle & MNS_NOCHECK)) + bmpRect.left += CheckBitmapWidth + 2; + if (!(checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + bmpRect.right = bmpRect.left + MenuInfo->maxBmpSize.cx; + MenuDrawBitmapItem(Dc, Item, &bmpRect, MenuInfo->Self, WndOwner, Action, MenuBar); + } } /* Draw the popup-menu arrow */ if (0 != (Item->fType & MF_POPUP)) @@ -767,7 +834,9 @@ UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE : DT_LEFT | DT_VCENTER | DT_SINGLELINE; - if( !(MenuInfo->dwStyle & MNS_CHECKORBMP)) + if(MenuInfo->dwStyle & MNS_CHECKORBMP) + Rect.left += max(0, MenuInfo->maxBmpSize.cx - GetSystemMetrics(SM_CXMENUCHECK)); + else Rect.left += MenuInfo->maxBmpSize.cx; if (0 != (Item->fState & MFS_DEFAULT)) @@ -779,11 +848,6 @@ { Rect.left += MENU_BAR_ITEMS_SPACE / 2; Rect.right -= MENU_BAR_ITEMS_SPACE / 2; - } - if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != 0 ) - { - Rect.left += MenuInfo->maxBmpSize.cx; - Rect.right -= MenuInfo->maxBmpSize.cx; } Text = (PWCHAR) Item->dwTypeData; @@ -1103,8 +1167,30 @@ NTSTATUS WINAPI User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength) { - LRESULT Result; - Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU"); + HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU"); + LRESULT Result = (LRESULT)hmenu; + + // removing space for checkboxes from menu + MENUINFO menuinfo = {0}; + menuinfo.cbSize = sizeof(menuinfo); + menuinfo.fMask = MIM_STYLE; + GetMenuInfo(hmenu, &menuinfo); + menuinfo.dwStyle |= MNS_NOCHECK; + SetMenuInfo(hmenu, &menuinfo); + + // adding bitmaps to menu items + MENUITEMINFOW info = {0}; + info.cbSize = sizeof(info); + info.fMask |= MIIM_BITMAP; + info.hbmpItem = HBMMENU_POPUP_MINIMIZE; + SetMenuItemInfoW(hmenu, SC_MINIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_RESTORE; + SetMenuItemInfoW(hmenu, SC_RESTORE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_MAXIMIZE; + SetMenuItemInfoW(hmenu, SC_MAXIMIZE, FALSE, &info); + info.hbmpItem = HBMMENU_POPUP_CLOSE; + SetMenuItemInfoW(hmenu, SC_CLOSE, FALSE, &info); + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); } @@ -1247,7 +1333,6 @@ MenuInfo->maxBmpSize.cy = abs(Size.cy); } MenuSetRosMenuInfo(MenuInfo); - ItemInfo->Rect.right += Size.cx + 2; itemheight = Size.cy + 2; if( !(MenuInfo->dwStyle & MNS_NOCHECK))

2 1

r41685 crashes early at boot in my real hardware (P-i @ 200 MHz)
by Javier Agustìn Fernàndez Arroyo 30 Jun '09

30 Jun '09

Hi all, As talked with Aleksey i would want to let you knwo that revision r41685 is broken, in my real hardware, at least. This is the log i get, im sorry to say i cannot give you more details (backtraces, disasm´s, and so, since even kb does not work after the crash. (ntoskrnl/kd/kdio.c:221) ReactOS 0.4-SVN (Build 20090629-r41685) (ntoskrnl/kd/kdio.c:222) Command Line: NOGUIBOOT DEBUGPORT=COM1 NOGUIBOOT DEBUGPORT=COM1 (ntoskrnl/kd/kdio.c:223) ARC Paths: multi(0)disk(0)cdrom(159) \ multi(0)disk(0)cdrom(159) \reactos\ Used memory 327284Kb (ntoskrnl/mm/mminit.c:224) Start End Type (ntoskrnl/mm/mminit.c:225) 0x80000000 - 0x80800000 Undefined region (ntoskrnl/mm/mminit.c:228) 0x80800000 - 0x80E00000 FreeLDR Kernel mapping region (ntoskrnl/mm/mminit.c:231) 0x80E00000 - 0x80FE0000 PFN Database region (ntoskrnl/mm/mminit.c:238) 0x80FE0000 - 0x873E0000 Non paged pool region (ntoskrnl/mm/mminit.c:241) 0x873E0000 - 0x8D7E0000 Paged pool region (ARMÂ³::INIT:340) System PTE count has been tuned to 22000 (90112000 bytes) (ARMÂ³::INIT:445) NP Pool has been tuned to: 10584064 bytes and 130072576 bytes (ARMÂ³::INIT:490) System PTE VA starts at: F3000000 (ARMÂ³::INIT:491) NP Expansion VA begins at: F89EC000 and ends at: FFBE0000 (ARMÂ³::INIT:507) PFN DB VA begins at: B0000000 and ends at: B01E0000 (ARMÂ³::INIT:510) PFN DB PA PFN begins at: 1000 (ARMÂ³::INIT:511) NP VA begins at: B01E0000 and ends at: B0BF8000 (ARMÂ³::INIT:514) NP PA PFN begins at: 11e0 (ARMÂ³::SYSPTE:341) System PTE space for 1 starting at: C03E27B4 and ending at: C03FEF78 Assertion '(MmNumberOfSystemPtes - OldCount) <= 1000' failed at ARMÂ³::INIT line 652 Entered debugger on embedded INT3 at 0x0008:0x808bfcf6. kdb:>

4 8

Re: [ros-dev] [ros-diffs] [dgorbachev] 41610: Remove a hack from NtAccessCheck(). Bug #4169.
by Alex Ionescu 29 Jun '09

29 Jun '09

Oh, I see. All these white spaces were hacks. Thanks for mixing in 500 whitespace and formatting changes with 5 lines of code changes. It makes it really clear! Has the kernel become a no-man's land of garbage? I'm thinking of removing my name from the sources if this keeps up. Best regards, Alex Ionescu On Thu, Jun 25, 2009 at 6:29 AM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Thu Jun 25 17:29:58 2009 > New Revision: 41610 > > URL: http://svn.reactos.org/svn/reactos?rev=41610&view=rev > Log: > Remove a hack from NtAccessCheck(). Bug #4169. > > Modified: > trunk/reactos/ntoskrnl/se/semgr.c > > Modified: trunk/reactos/ntoskrnl/se/semgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=41… > ============================================================================== > --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Jun 25 17:29:58 2009 > @@ -49,7 +49,7 @@ > SepExports.SeSystemEnvironmentPrivilege = SeSystemEnvironmentPrivilege; > SepExports.SeChangeNotifyPrivilege = SeChangeNotifyPrivilege; > SepExports.SeRemoteShutdownPrivilege = SeRemoteShutdownPrivilege; > - > + > SepExports.SeNullSid = SeNullSid; > SepExports.SeWorldSid = SeWorldSid; > SepExports.SeLocalSid = SeLocalSid; > @@ -72,11 +72,11 @@ > SepExports.SeAuthenticatedUsersSid = SeAuthenticatedUsersSid; > SepExports.SeRestrictedSid = SeRestrictedSid; > SepExports.SeAnonymousLogonSid = SeAnonymousLogonSid; > - > + > SepExports.SeUndockPrivilege = SeUndockPrivilege; > SepExports.SeSyncAgentPrivilege = SeSyncAgentPrivilege; > SepExports.SeEnableDelegationPrivilege = SeEnableDelegationPrivilege; > - > + > SeExports = &SepExports; > return TRUE; > } > @@ -92,18 +92,18 @@ > if (!SepInitSDs()) return FALSE; > SepInitPrivileges(); > if (!SepInitExports()) return FALSE; > - > + > /* Initialize the subject context lock */ > ExInitializeResource(&SepSubjectContextLock); > - > + > /* Initialize token objects */ > SepInitializeTokenImplementation(); > - > + > /* Clear impersonation info for the idle thread */ > PsGetCurrentThread()->ImpersonationInfo = NULL; > PspClearCrossThreadFlag(PsGetCurrentThread(), > CT_ACTIVE_IMPERSONATION_INFO_BIT); > - > + > /* Initialize the boot token */ > ObInitializeFastReference(&PsGetCurrentProcess()->Token, NULL); > ObInitializeFastReference(&PsGetCurrentProcess()->Token, > @@ -117,7 +117,7 @@ > { > NTSTATUS Status; > PAGED_CODE(); > - > + > /* Insert the system token into the tree */ > Status = ObInsertObject((PVOID)(PsGetCurrentProcess()->Token.Value & > ~MAX_FAST_REFS), > @@ -127,7 +127,7 @@ > NULL, > NULL); > ASSERT(NT_SUCCESS(Status)); > - > + > /* FIXME: TODO \\ Security directory */ > return TRUE; > } > @@ -140,17 +140,17 @@ > switch (ExpInitializationPhase) > { > case 0: > - > + > /* Do Phase 0 */ > return SepInitializationPhase0(); > - > + > case 1: > - > + > /* Do Phase 1 */ > return SepInitializationPhase1(); > - > + > default: > - > + > /* Don't know any other phase! Bugcheck! */ > KeBugCheckEx(UNEXPECTED_INITIALIZATION_CALL, > 0, > @@ -170,7 +170,7 @@ > HANDLE DirectoryHandle; > HANDLE EventHandle; > NTSTATUS Status; > - > + > /* Create '\Security' directory */ > RtlInitUnicodeString(&Name, > L"\\Security"); > @@ -187,7 +187,7 @@ > DPRINT1("Failed to create 'Security' directory!\n"); > return FALSE; > } > - > + > /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ > RtlInitUnicodeString(&Name, > L"\\LSA_AUTHENTICATION_INITALIZED"); > @@ -207,12 +207,12 @@ > NtClose(DirectoryHandle); > return FALSE; > } > - > + > ZwClose(EventHandle); > ZwClose(DirectoryHandle); > - > + > /* FIXME: Create SRM port and listener thread */ > - > + > return TRUE; > } > > @@ -228,16 +228,16 @@ > IN PGENERIC_MAPPING GenericMapping) > { > PAGED_CODE(); > - > + > /* Select the operation type */ > switch (OperationType) > { > /* Setting a new descriptor */ > case SetSecurityDescriptor: > - > + > /* Sanity check */ > ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); > - > + > /* Set the information */ > return ObSetSecurityDescriptorInfo(Object, > SecurityInformation, > @@ -245,33 +245,33 @@ > OldSecurityDescriptor, > PoolType, > GenericMapping); > - > + > case QuerySecurityDescriptor: > - > + > /* Query the information */ > return ObQuerySecurityDescriptorInfo(Object, > SecurityInformation, > SecurityDescriptor, > ReturnLength, > OldSecurityDescriptor); > - > + > case DeleteSecurityDescriptor: > - > + > /* De-assign it */ > return ObDeassignSecurity(OldSecurityDescriptor); > - > + > case AssignSecurityDescriptor: > - > + > /* Assign it */ > ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); > return STATUS_SUCCESS; > - > + > default: > - > + > /* Bug check */ > KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); > } > - > + > /* Should never reach here */ > ASSERT(FALSE); > return STATUS_SUCCESS; > @@ -284,14 +284,14 @@ > { > ULONG i; > PTOKEN Token = (PTOKEN)_Token; > - > + > PAGED_CODE(); > - > + > if (Token->UserAndGroupCount == 0) > { > return FALSE; > } > - > + > for (i=0; i<Token->UserAndGroupCount; i++) > { > if (RtlEqualSid(Sid, Token->UserAndGroups[i].Sid)) > @@ -300,11 +300,11 @@ > { > return TRUE; > } > - > + > return FALSE; > } > } > - > + > return FALSE; > } > > @@ -314,7 +314,7 @@ > OUT PACCESS_MASK DesiredAccess) > { > *DesiredAccess = 0; > - > + > if (SecurityInformation & (OWNER_SECURITY_INFORMATION | > GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) > { > @@ -331,7 +331,7 @@ > OUT PACCESS_MASK DesiredAccess) > { > *DesiredAccess = 0; > - > + > if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) > { > *DesiredAccess |= WRITE_OWNER; > @@ -374,7 +374,7 @@ > PSID Sid; > NTSTATUS Status; > PAGED_CODE(); > - > + > /* Check if this is kernel mode */ > if (AccessMode == KernelMode) > { > @@ -391,12 +391,12 @@ > /* Give the desired and previous access */ > *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; > } > - > + > /* Success */ > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > - > + > /* Check if we didn't get an SD */ > if (!SecurityDescriptor) > { > @@ -404,7 +404,7 @@ > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* Check for invalid impersonation */ > if ((SubjectSecurityContext->ClientToken) && > (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation)) > @@ -412,7 +412,7 @@ > *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL; > return FALSE; > } > - > + > /* Check for no access desired */ > if (!DesiredAccess) > { > @@ -423,31 +423,31 @@ > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* Return the previous access only */ > *GrantedAccess = PreviouslyGrantedAccess; > *AccessStatus = STATUS_SUCCESS; > *Privileges = NULL; > return TRUE; > } > - > + > /* Acquire the lock if needed */ > if (!SubjectContextLocked) SeLockSubjectContext(SubjectSecurityContext); > - > + > /* Map given accesses */ > RtlMapGenericMask(&DesiredAccess, GenericMapping); > if (PreviouslyGrantedAccess) > RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); > - > - > - > + > + > + > CurrentAccess = PreviouslyGrantedAccess; > - > - > - > + > + > + > Token = SubjectSecurityContext->ClientToken ? > SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; > - > + > /* Get the DACL */ > Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, > &Present, > @@ -459,11 +459,11 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *AccessStatus = Status; > return FALSE; > } > - > + > /* RULE 1: Grant desired access if the object is unprotected */ > if (Present == TRUE && Dacl == NULL) > { > @@ -471,18 +471,18 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = DesiredAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > - > + > CurrentAccess = PreviouslyGrantedAccess; > - > + > /* RULE 2: Check token for 'take ownership' privilege */ > Privilege.Luid = SeTakeOwnershipPrivilege; > Privilege.Attributes = SE_PRIVILEGE_ENABLED; > - > + > if (SepPrivilegeCheck(Token, > &Privilege, > 1, > @@ -497,13 +497,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = CurrentAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > } > - > + > /* RULE 3: Check whether the token is the owner */ > Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, > &Sid, > @@ -515,11 +515,11 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *AccessStatus = Status; > return FALSE; > } > - > + > if (Sid && SepSidInToken(Token, Sid)) > { > CurrentAccess |= (READ_CONTROL | WRITE_DAC); > @@ -530,13 +530,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = CurrentAccess; > *AccessStatus = STATUS_SUCCESS; > return TRUE; > } > } > - > + > /* Fail if DACL is absent */ > if (Present == FALSE) > { > @@ -544,12 +544,12 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = 0; > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > - > + > /* RULE 4: Grant rights according to the DACL */ > CurrentAce = (PACE)(Dacl + 1); > for (i = 0; i < Dacl->AceCount; i++) > @@ -563,13 +563,13 @@ > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > *GrantedAccess = 0; > *AccessStatus = STATUS_ACCESS_DENIED; > return FALSE; > } > } > - > + > else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) > { > if (SepSidInToken(Token, Sid)) > @@ -585,17 +585,17 @@ > } > CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); > } > - > + > if (SubjectContextLocked == FALSE) > { > SeUnlockSubjectContext(SubjectSecurityContext); > } > - > + > DPRINT("CurrentAccess %08lx\n DesiredAccess %08lx\n", > CurrentAccess, DesiredAccess); > - > + > *GrantedAccess = CurrentAccess & DesiredAccess; > - > + > if (DesiredAccess & MAXIMUM_ALLOWED) > { > *GrantedAccess = CurrentAccess; > @@ -688,32 +688,24 @@ > SubjectSecurityContext.ProcessAuditId = NULL; > SeLockSubjectContext(&SubjectSecurityContext); > > - /* FIXME */ > /* Now perform the access check */ > - if (SeAccessCheck(SecurityDescriptor, > - &SubjectSecurityContext, > - TRUE, > - DesiredAccess, > - 0, > - &PrivilegeSet, //FIXME > - GenericMapping, > - PreviousMode, > - GrantedAccess, > - AccessStatus)) > - { > - Status = *AccessStatus; > - } > - else > - { > - Status = STATUS_ACCESS_DENIED; > - } > + SeAccessCheck(SecurityDescriptor, > + &SubjectSecurityContext, > + TRUE, > + DesiredAccess, > + 0, > + &PrivilegeSet, //FIXME > + GenericMapping, > + PreviousMode, > + GrantedAccess, > + AccessStatus); > > /* Unlock subject context and dereference the token */ > SeUnlockSubjectContext(&SubjectSecurityContext); > ObDereferenceObject(Token); > > - /* Check succeeded? */ > - return Status; > + /* Check succeeded */ > + return STATUS_SUCCESS; > } > > > >

3 3

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 41658: - Move all the functions from drvlck.c and verifier.c to ARM3's drvmgmt.c: - "Managing driver managing" (by David Welch) is no more... the routines have been properly renamed and cleaned up. - Also moved Driver Verifier helper routines in here, and fixed a couple of bugs: - Do not allow hooking of the kernel or HAL image (tested on Windows Server 2003) - Cleanup some useless variable redefinitions and code complexity. - Documented what some of the Mm Lock/U
by Timo Kreuzer 28 Jun '09

28 Jun '09

this commit - removed Alex Ionescu's name from his code (verifier.c) - reformatted his code simply to reformat it - changed license from GPL to BSD Recommend this user gets banned for breaking licence / IP policies / coding rules. :-P Regards, Timo ros-arm-bringup(a)svn.reactos.org wrote: > Author: ros-arm-bringup > Date: Sun Jun 28 11:32:52 2009 > New Revision: 41658 > > URL: http://svn.reactos.org/svn/reactos?rev=41658&view=rev > Log: > - Move all the functions from drvlck.c and verifier.c to ARM3's drvmgmt.c: > - "Managing driver managing" (by David Welch) is no more... the routines have been properly renamed and cleaned up. > - Also moved Driver Verifier helper routines in here, and fixed a couple of bugs: > - Do not allow hooking of the kernel or HAL image (tested on Windows Server 2003) > - Cleanup some useless variable redefinitions and code complexity. > - Documented what some of the Mm Lock/Unlock Pageable Section/Driver functions should do, for later if needed. > - Made aliasses so the typo "Pagable" functions redirect to the correct "Pageable" functions. > - No functional change -- the Verifier functions were unused, and the drvlock.c functions were unimplemented (and still are). > - Also move one more *Pageable* function from wset.c to ARM3's drvmgmt.c -- it seemed to have been a lost orphan (Also unimplemented). > > > Added: > trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c > - copied, changed from r41647, trunk/reactos/ntoskrnl/mm/drvlck.c > Removed: > trunk/reactos/ntoskrnl/mm/drvlck.c > trunk/reactos/ntoskrnl/mm/verifier.c > Modified: > trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > trunk/reactos/ntoskrnl/mm/wset.c > trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > trunk/reactos/ntoskrnl/ntoskrnl.pspec > > Copied: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c (from r41647, trunk/reactos/ntoskrnl/mm/drvlck.c) > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -1,102 +1,324 @@ > /* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS kernel > - * FILE: ntoskrnl/mm/drvlck.c > - * PURPOSE: Managing driver managing > - * > - * PROGRAMMERS: David Welch (welch(a)mcmail.com) > - */ > - > -/* INCLUDES *****************************************************************/ > + * PROJECT: ReactOS Kernel > + * LICENSE: BSD - See COPYING.ARM in the top level directory > + * FILE: ntoskrnl/mm/ARM3/drvmgmt.c > + * PURPOSE: ARM Memory Manager Driver Management > + * PROGRAMMERS: ReactOS Portable Systems Group > + */ > + > +/* INCLUDES *******************************************************************/ > > #include <ntoskrnl.h> > +#define NDEBUG > #include <debug.h> > > -/* FUNCTIONS *****************************************************************/ > - > -#undef MmLockPagableDataSection > - > -#if 0 > +#line 15 "ARMĂ�Âł::DRVMGMT" > +#define MODULE_INVOLVED_IN_ARM3 > +#include "../ARM3/miarm.h" > + > +/* GLOBALS *******************************************************************/ > + > +MM_DRIVER_VERIFIER_DATA MmVerifierData; > +LIST_ENTRY MiVerifierDriverAddedThunkListHead; > +KMUTANT MmSystemLoadLock; > +ULONG MiActiveVerifierThunks; > +extern LIST_ENTRY PsLoadedModuleList; > + > +/* PRIVATE FUNCTIONS *********************************************************/ > + > +PLDR_DATA_TABLE_ENTRY > +NTAPI > +MiLookupDataTableEntry(IN PVOID Address) > +{ > + PLDR_DATA_TABLE_ENTRY LdrEntry, FoundEntry = NULL; > + PLIST_ENTRY NextEntry; > + PAGED_CODE(); > + > + // > + // Loop entries > + // > + NextEntry = PsLoadedModuleList.Flink; > + do > + { > + // > + // Get the loader entry > + // > + LdrEntry = CONTAINING_RECORD(NextEntry, > + LDR_DATA_TABLE_ENTRY, > + InLoadOrderLinks); > + > + // > + // Check if the address matches > + // > + if ((Address >= LdrEntry->DllBase) && > + (Address < (PVOID)((ULONG_PTR)LdrEntry->DllBase + > + LdrEntry->SizeOfImage))) > + { > + // > + // Found a match > + // > + FoundEntry = LdrEntry; > + break; > + } > + > + // > + // Move on > + // > + NextEntry = NextEntry->Flink; > + } while(NextEntry != &PsLoadedModuleList); > + > + // > + // Return the entry > + // > + return FoundEntry; > +} > + > +/* PUBLIC FUNCTIONS ***********************************************************/ > + > +/* > + * @unimplemented > + */ > VOID > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -/* > - * FUNCTION: Releases a section of driver code or driver data, previously > - * locked into system space with MmLockPagableCodeSection, > - * MmLockPagableDataSection or MmLockPagableSectionByHandle > - * ARGUMENTS: > - * ImageSectionHandle = Handle returned by MmLockPagableCodeSection or > - * MmLockPagableDataSection > - */ > -{ > - // MmUnlockMemoryArea((MEMORY_AREA *)ImageSectionHandle); > - UNIMPLEMENTED; > -} > -#endif > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > - > -#if 0 > +NTAPI > +MmUnlockPageableImageSection(IN PVOID ImageSectionHandle) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > +VOID > +NTAPI > +MmLockPageableSectionByHandle(IN PVOID ImageSectionHandle) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > PVOID > -MmLockPagableCodeSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > -#endif > - > +NTAPI > +MmLockPageableDataSection(IN PVOID AddressWithinSection) > +{ > + // > + // We should just find the section and call MmLockPageableSectionByHandle > + // > + UNIMPLEMENTED; > + return AddressWithinSection; > +} > + > +/* > + * @unimplemented > + */ > +PVOID > +NTAPI > +MmPageEntireDriver(IN PVOID AddressWithinSection) > +{ > + // > + // We should find the driver loader entry and return its base address > + // > + UNIMPLEMENTED; > + return NULL; > +} > + > +/* > + * @unimplemented > + */ > +VOID > +NTAPI > +MmResetDriverPaging(IN PVOID AddressWithinSection) > +{ > + UNIMPLEMENTED; > +} > + > +/* > + * @unimplemented > + */ > +ULONG > +NTAPI > +MmTrimAllSystemPageableMemory(IN ULONG PurgeTransitionList) > +{ > + UNIMPLEMENTED; > + return 0; > +} > > /* > * @implemented > */ > -PVOID NTAPI > -MmLockPagableDataSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), > - AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > -/* > - * @unimplemented > - */ > -PVOID NTAPI > -MmPageEntireDriver(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > - return NULL; > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmResetDriverPaging(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > +NTSTATUS > +NTAPI > +MmAddVerifierThunks(IN PVOID ThunkBuffer, > + IN ULONG ThunkBufferSize) > +{ > + PDRIVER_VERIFIER_THUNK_PAIRS ThunkTable; > + ULONG ThunkCount; > + PDRIVER_SPECIFIED_VERIFIER_THUNKS DriverThunks; > + PLDR_DATA_TABLE_ENTRY LdrEntry; > + PVOID ModuleBase, ModuleEnd; > + ULONG i; > + NTSTATUS Status = STATUS_SUCCESS; > + PAGED_CODE(); > + > + // > + // Make sure the driver verifier is initialized > + // > + if (!MiVerifierDriverAddedThunkListHead.Flink) return STATUS_NOT_SUPPORTED; > + > + // > + // Get the thunk pairs and count them > + // > + ThunkCount = ThunkBufferSize / sizeof(DRIVER_VERIFIER_THUNK_PAIRS); > + if (!ThunkCount) return STATUS_INVALID_PARAMETER_1; > + > + // > + // Now allocate our own thunk table > + // > + DriverThunks = ExAllocatePoolWithTag(PagedPool, > + sizeof(*DriverThunks) + > + ThunkCount * > + sizeof(DRIVER_VERIFIER_THUNK_PAIRS), > + 'tVmM'); > + if (!DriverThunks) return STATUS_INSUFFICIENT_RESOURCES; > + > + // > + // Now copy the driver-fed part > + // > + ThunkTable = (PDRIVER_VERIFIER_THUNK_PAIRS)(DriverThunks + 1); > + RtlCopyMemory(ThunkTable, > + ThunkBuffer, > + ThunkCount * sizeof(DRIVER_VERIFIER_THUNK_PAIRS)); > + > + // > + // Acquire the system load lock > + // > + KeEnterCriticalRegion(); > + KeWaitForSingleObject(&MmSystemLoadLock, > + WrVirtualMemory, > + KernelMode, > + FALSE, > + NULL); > + > + // > + // Get the loader entry > + // > + LdrEntry = MiLookupDataTableEntry(ThunkTable->PristineRoutine); > + if (!LdrEntry) > + { > + // > + // Fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + > + // > + // Get driver base and end > + // > + ModuleBase = LdrEntry->DllBase; > + ModuleEnd = (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage); > + > + // > + // Don't allow hooking the kernel or HAL > + // > + if (ModuleBase < (PVOID)(KSEG0_BASE + MmBootImageSize)) > + { > + // > + // Fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + > + // > + // Loop all the thunks > + // > + for (i = 0; i < ThunkCount; i++) > + { > + // > + // Make sure it's in the driver > + // > + if (((ULONG_PTR)ThunkTable->PristineRoutine < (ULONG_PTR)ModuleBase) || > + ((ULONG_PTR)ThunkTable->PristineRoutine >= (ULONG_PTR)ModuleEnd)) > + { > + // > + // Nope, fail > + // > + Status = STATUS_INVALID_PARAMETER_2; > + goto Cleanup; > + } > + } > + > + // > + // Otherwise, add this entry > + // > + DriverThunks->DataTableEntry = LdrEntry; > + DriverThunks->NumberOfThunks = ThunkCount; > + MiActiveVerifierThunks++; > + InsertTailList(&MiVerifierDriverAddedThunkListHead, > + &DriverThunks->ListEntry); > + DriverThunks = NULL; > + > +Cleanup: > + // > + // Release the lock > + // > + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); > + KeLeaveCriticalRegion(); > + > + // > + // Free the table if we failed and return status > + // > + if (DriverThunks) ExFreePool(DriverThunks); > + return Status; > +} > + > +/* > + * @implemented > + */ > +LOGICAL > +NTAPI > +MmIsDriverVerifying(IN PDRIVER_OBJECT DriverObject) > +{ > + PLDR_DATA_TABLE_ENTRY LdrEntry; > + > + // > + // Get the loader entry > + // > + LdrEntry = (PLDR_DATA_TABLE_ENTRY)DriverObject->DriverSection; > + if (!LdrEntry) return FALSE; > + > + // > + // Check if we're verifying or not > + // > + return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; > +} > + > +/* > + * @implemented > + */ > +NTSTATUS > +NTAPI > +MmIsVerifierEnabled(OUT PULONG VerifierFlags) > +{ > + // > + // Check if we've actually added anything to the list > + // > + if (MiVerifierDriverAddedThunkListHead.Flink) > + { > + // > + // We have, read the verifier level > + // > + *VerifierFlags = MmVerifierData.Level; > + return STATUS_SUCCESS; > + } > + > + // > + // Otherwise, we're disabled > + // > + *VerifierFlags = 0; > + return STATUS_NOT_SUPPORTED; > } > > /* EOF */ > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -52,6 +52,7 @@ > extern PMMPTE MiFirstReservedZeroingPte; > extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType]; > extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; > +extern ULONG MmBootImageSize; > > VOID > NTAPI > > Removed: trunk/reactos/ntoskrnl/mm/drvlck.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=4… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/drvlck.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/drvlck.c (removed) > @@ -1,102 +1,0 @@ > -/* > - * COPYRIGHT: See COPYING in the top level directory > - * PROJECT: ReactOS kernel > - * FILE: ntoskrnl/mm/drvlck.c > - * PURPOSE: Managing driver managing > - * > - * PROGRAMMERS: David Welch (welch(a)mcmail.com) > - */ > - > -/* INCLUDES *****************************************************************/ > - > -#include <ntoskrnl.h> > -#include <debug.h> > - > -/* FUNCTIONS *****************************************************************/ > - > -#undef MmLockPagableDataSection > - > -#if 0 > -VOID > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -/* > - * FUNCTION: Releases a section of driver code or driver data, previously > - * locked into system space with MmLockPagableCodeSection, > - * MmLockPagableDataSection or MmLockPagableSectionByHandle > - * ARGUMENTS: > - * ImageSectionHandle = Handle returned by MmLockPagableCodeSection or > - * MmLockPagableDataSection > - */ > -{ > - // MmUnlockMemoryArea((MEMORY_AREA *)ImageSectionHandle); > - UNIMPLEMENTED; > -} > -#endif > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > - > -#if 0 > -PVOID > -MmLockPagableCodeSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > -#endif > - > - > -/* > - * @implemented > - */ > -PVOID NTAPI > -MmLockPagableDataSection(IN PVOID AddressWithinSection) > -{ > - PVOID Handle; > - Handle = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), > - AddressWithinSection); > - MmLockPagableSectionByHandle(Handle); > - return(Handle); > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmUnlockPagableImageSection(IN PVOID ImageSectionHandle) > -{ > - UNIMPLEMENTED; > -} > - > -/* > - * @unimplemented > - */ > -PVOID NTAPI > -MmPageEntireDriver(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > - return NULL; > -} > - > - > -/* > - * @unimplemented > - */ > -VOID NTAPI > -MmResetDriverPaging(IN PVOID AddressWithinSection) > -{ > - UNIMPLEMENTED; > -} > - > -/* EOF */ > > Removed: trunk/reactos/ntoskrnl/mm/verifier.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/verifier.c (removed) > @@ -1,190 +1,0 @@ > -/* > -* PROJECT: ReactOS Kernel > -* LICENSE: GPL - See COPYING in the top level directory > -* FILE: ntoskrnl/mm/verifier.c > -* PURPOSE: Mm Driver Verifier Routines > -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) > -*/ > - > -/* INCLUDES ******************************************************************/ > - > -#include <ntoskrnl.h> > -#define NDEBUG > -#include <debug.h> > - > -/* GLOBALS *******************************************************************/ > - > -MM_DRIVER_VERIFIER_DATA MmVerifierData; > -LIST_ENTRY MiVerifierDriverAddedThunkListHead; > -KMUTANT MmSystemLoadLock; > -ULONG MiActiveVerifierThunks; > - > -extern LIST_ENTRY PsLoadedModuleList; > - > -/* PRIVATE FUNCTIONS *********************************************************/ > - > -PLDR_DATA_TABLE_ENTRY > -NTAPI > -MiLookupDataTableEntry(IN PVOID Address) > -{ > - PLDR_DATA_TABLE_ENTRY LdrEntry, FoundEntry = NULL; > - PLIST_ENTRY NextEntry; > - PAGED_CODE(); > - > - /* Loop entries */ > - NextEntry = PsLoadedModuleList.Flink; > - do > - { > - /* Get the loader entry */ > - LdrEntry = CONTAINING_RECORD(NextEntry, > - LDR_DATA_TABLE_ENTRY, > - InLoadOrderLinks); > - > - /* Check if the address matches */ > - if ((Address >= LdrEntry->DllBase) && > - (Address < (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage))) > - { > - /* Found a match */ > - FoundEntry = LdrEntry; > - break; > - } > - > - /* Move on */ > - NextEntry = NextEntry->Flink; > - } while(NextEntry != &PsLoadedModuleList); > - > - /* Return the entry */ > - return FoundEntry; > -} > - > -/* PUBLIC FUNCTIONS **********************************************************/ > - > -/* > - * @implemented > - */ > -NTSTATUS > -NTAPI > -MmAddVerifierThunks(IN PVOID ThunkBuffer, > - IN ULONG ThunkBufferSize) > -{ > - PDRIVER_VERIFIER_THUNK_PAIRS ThunkPairs, DriverThunkTable; > - ULONG ThunkCount; > - PDRIVER_SPECIFIED_VERIFIER_THUNKS ThunkTable; > - PLDR_DATA_TABLE_ENTRY LdrEntry; > - PVOID ModuleBase, ModuleEnd; > - ULONG i; > - NTSTATUS Status = STATUS_SUCCESS; > - PAGED_CODE(); > - > - /* Make sure the driver verifier is initialized */ > - if (!MiVerifierDriverAddedThunkListHead.Flink) return STATUS_NOT_SUPPORTED; > - > - /* Get the thunk pairs and count them */ > - ThunkPairs = (PDRIVER_VERIFIER_THUNK_PAIRS)ThunkBuffer; > - ThunkCount = ThunkBufferSize / sizeof(DRIVER_VERIFIER_THUNK_PAIRS); > - if (!ThunkCount) return STATUS_INVALID_PARAMETER_1; > - > - /* Now allocate our own thunk table */ > - ThunkTable = ExAllocatePoolWithTag(PagedPool, > - sizeof(DRIVER_SPECIFIED_VERIFIER_THUNKS) + > - ThunkCount * > - sizeof(DRIVER_VERIFIER_THUNK_PAIRS), > - TAG('M', 'm', 'V', 't')); > - if (!ThunkTable) return STATUS_INSUFFICIENT_RESOURCES; > - > - /* Now copy the driver-fed part */ > - DriverThunkTable = (PDRIVER_VERIFIER_THUNK_PAIRS)(ThunkTable + 1); > - RtlCopyMemory(DriverThunkTable, > - ThunkPairs, > - ThunkCount * sizeof(DRIVER_VERIFIER_THUNK_PAIRS)); > - > - /* Acquire the system load lock */ > - KeEnterCriticalRegion(); > - KeWaitForSingleObject(&MmSystemLoadLock, > - WrVirtualMemory, > - KernelMode, > - FALSE, > - NULL); > - > - /* Get the loader entry */ > - LdrEntry = MiLookupDataTableEntry(DriverThunkTable->PristineRoutine); > - if (!LdrEntry) > - { > - /* Fail */ > - Status = STATUS_INVALID_PARAMETER_2; > - goto Cleanup; > - } > - > - /* Get driver base and end */ > - ModuleBase = LdrEntry->DllBase; > - ModuleEnd = (PVOID)((ULONG_PTR)LdrEntry->DllBase + LdrEntry->SizeOfImage); > - > - /* Loop all the thunks */ > - for (i = 0; i < ThunkCount; i++) > - { > - /* Make sure it's in the driver */ > - if (((ULONG_PTR)DriverThunkTable->PristineRoutine < (ULONG_PTR)ModuleBase) || > - ((ULONG_PTR)DriverThunkTable->PristineRoutine >= (ULONG_PTR)ModuleEnd)) > - { > - /* Nope, fail */ > - Status = STATUS_INVALID_PARAMETER_2; > - goto Cleanup; > - } > - } > - > - /* Otherwise, add this entry */ > - ThunkTable->DataTableEntry = LdrEntry; > - ThunkTable->NumberOfThunks = ThunkCount; > - MiActiveVerifierThunks++; > - InsertTailList(&MiVerifierDriverAddedThunkListHead, > - &ThunkTable->ListEntry); > - ThunkTable = NULL; > - > -Cleanup: > - /* Release the lock */ > - KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); > - KeLeaveCriticalRegion(); > - > - /* Free the table if we failed and return status */ > - if (ThunkTable) ExFreePool(ThunkTable); > - return Status; > -} > - > -/* > - * @implemented > - */ > -LOGICAL > -NTAPI > -MmIsDriverVerifying(IN PDRIVER_OBJECT DriverObject) > -{ > - PLDR_DATA_TABLE_ENTRY LdrEntry; > - > - /* Get the loader entry */ > - LdrEntry = (PLDR_DATA_TABLE_ENTRY)DriverObject->DriverSection; > - if (!LdrEntry) return FALSE; > - > - /* Check if we're verifying or not */ > - return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; > -} > - > -/* > - * @implemented > - */ > -NTSTATUS > -NTAPI > -MmIsVerifierEnabled(OUT PULONG VerifierFlags) > -{ > - /* Check if we've actually added anything to the list */ > - if (MiVerifierDriverAddedThunkListHead.Flink) > - { > - /* We have, read the verifier level */ > - *VerifierFlags = MmVerifierData.Level; > - return STATUS_SUCCESS; > - } > - > - /* Otherwise, we're disabled */ > - *VerifierFlags = 0; > - return STATUS_NOT_SUPPORTED; > -} > - > -/* EOF */ > > Modified: trunk/reactos/ntoskrnl/mm/wset.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?rev=416… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/wset.c [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -46,16 +46,3 @@ > } > return(STATUS_SUCCESS); > } > - > -/* > - * @unimplemented > - */ > -ULONG > -NTAPI > -MmTrimAllSystemPagableMemory ( > - IN ULONG PurgeTransitionList > - ) > -{ > - UNIMPLEMENTED; > - return 0; > -} > > Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -361,6 +361,7 @@ > </if> > <directory name="ARM3"> > <file>contmem.c</file> > + <file>drvmgmt.c</file> > <file>dynamic.c</file> > <file>hypermap.c</file> > <file>init.c</file> > @@ -372,7 +373,6 @@ > <file>anonmem.c</file> > <file>balance.c</file> > <file>dbgpool.c</file> > - <file>drvlck.c</file> > <file>freelist.c</file> > <file>kmap.c</file> > <file>marea.c</file> > @@ -392,7 +392,6 @@ > <file>rmap.c</file> > <file>section.c</file> > <file>sysldr.c</file> > - <file>verifier.c</file> > <file>virtual.c</file> > <file>wset.c</file> > <if property="_ELF_" value="1"> > > Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sun Jun 28 11:32:52 2009 > @@ -771,9 +771,9 @@ > @ stdcall MmIsRecursiveIoFault() > @ stdcall MmIsThisAnNtAsSystem() > @ stdcall MmIsVerifierEnabled(ptr) > -@ stdcall MmLockPagableDataSection(ptr) > -@ stdcall MmLockPagableImageSection(ptr) MmLockPagableDataSection > -@ stdcall MmLockPagableSectionByHandle(ptr) > +@ stdcall MmLockPagableDataSection(ptr) MmLockPageableDataSection > +@ stdcall MmLockPagableImageSection(ptr) MmLockPageableDataSection > +@ stdcall MmLockPagableSectionByHandle(ptr) MmLockPageableSectionByHandle > @ stdcall MmMapIoSpace(long long long long) > @ stdcall MmMapLockedPages(ptr long) > @ stdcall MmMapLockedPagesSpecifyCache(ptr long long ptr long long) > @@ -801,8 +801,8 @@ > @ stdcall MmSetBankedSection(long long long long long long) > @ stdcall MmSizeOfMdl(ptr long) > @ extern MmSystemRangeStart > -@ stdcall MmTrimAllSystemPagableMemory(long) > -@ stdcall MmUnlockPagableImageSection(ptr) > +@ stdcall MmTrimAllSystemPagableMemory(long) MmTrimAllSystemPageableMemory > +@ stdcall MmUnlockPagableImageSection(ptr) MmUnlockPageableImageSection > @ stdcall MmUnlockPages(ptr) > @ stdcall MmUnmapIoSpace(ptr long) > @ stdcall MmUnmapLockedPages(ptr ptr) > > >

1 0

Re: [ros-dev] [ros-diffs] [cwittich] 41599: stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003
by Alex Ionescu 25 Jun '09

25 Jun '09

Statics? Win32 flags? Hungarian notation? What is this -- Wine? Please revert this shit. Best regards, Alex Ionescu On Wed, Jun 24, 2009 at 12:53 PM, <cwittich(a)svn.reactos.org> wrote: > Author: cwittich > Date: Wed Jun 24 23:53:54 2009 > New Revision: 41599 > > URL: http://svn.reactos.org/svn/reactos?rev=41599&view=rev > Log: > stub NtSetThreadExecutionState needed by PowerPoint Viewer 2003 > > Modified: > trunk/reactos/ntoskrnl/po/power.c > > Modified: trunk/reactos/ntoskrnl/po/power.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=41… > ============================================================================== > --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Jun 24 23:53:54 2009 > @@ -588,6 +588,16 @@ > NtSetThreadExecutionState(IN EXECUTION_STATE esFlags, > OUT EXECUTION_STATE *PreviousFlags) > { > - UNIMPLEMENTED; > - return STATUS_NOT_IMPLEMENTED; > -} > + static EXECUTION_STATE current = > + ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; > + EXECUTION_STATE old = current; > + > + UNIMPLEMENTED; > + > + if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) > + current = esFlags; > + > + *PreviousFlags = old; > + > + return STATUS_SUCCESS; > +} > >

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 41604: Rewrite (NtUser)SystemParametersInfo and related. - Instead of getting the data from the window station and other strange places, the values are now mostly stored in a global variable. This is possible because NtUser
by Steven Edwards 25 Jun '09

25 Jun '09

On Wed, Jun 24, 2009 at 10:43 PM, <tkreuzer(a)svn.reactos.org> wrote: > - user32_winetest sysparams: before: 634 executed / 235 failures, after: > 1093 executed, 11 failures > Very impressive. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 41571: - Do not reformat other people's code simply to reformat it.
by Timo Kreuzer 23 Jun '09

23 Jun '09

lol, what about keeping the style consistent? Also "//" is C++ / C99 comment style and not ANSI C compliant. ros-arm-bringup(a)svn.reactos.org schrieb: > Author: ros-arm-bringup > Date: Tue Jun 23 09:00:48 2009 > New Revision: 41571 > > URL: http://svn.reactos.org/svn/reactos?rev=41571&view=rev > Log: > - Do not reformat other people's code simply to reformat it. > > > Modified: > trunk/reactos/ntoskrnl/mm/mminit.c > > Modified: trunk/reactos/ntoskrnl/mm/mminit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 23 09:00:48 2009 > @@ -384,7 +384,9 @@ > /* Unmap low memory */ > MmDeletePageTable(NULL, 0); > > - /* Initialize ARMĂ?Âł */ > + // > + // Initialize ARMĂ?Âł > + // > MmArmInitSystem(0, KeLoaderBlock); > > /* Initialize nonpaged pool */ > > >

1 0

0.3.10 branching
by Aleksey Bragin 23 Jun '09

23 Jun '09

Hi, after thorough testing, 41446 appears to be the revision it would make sense to branch 0.3.10 from (according to Victor Martinez). Colin - please do a branch from 41446, and besides applying our usual hacks, revert the most recent wininet sync since it breaks Download! app. If you could do a prerelease iso for testing too, that would be great. WBR, Aleksey Bragin.

4 3

Re: [ros-dev] [ros-diffs] [hyperion] 41564: Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone
by Timo Kreuzer 23 Jun '09

23 Jun '09

Can you explain what's broken with the current usage? Maybe we can avoid it in the future / fix current usage bit by bit? hyperion(a)svn.reactos.org schrieb: > Author: hyperion > Date: Tue Jun 23 00:27:16 2009 > New Revision: 41564 > > URL: http://svn.reactos.org/svn/reactos?rev=41564&view=rev > Log: > Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone > > Modified: > trunk/reactos/include/reactos/libs/pseh/pseh2.h > > Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… > ============================================================================== > --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) > +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Tue Jun 23 00:27:16 2009 > @@ -401,10 +401,10 @@ > > #include <excpt.h> > > -#define _SEH2_TRY __try > -#define _SEH2_FINALLY __finally > -#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) > -#define _SEH2_END > +#define _SEH2_TRY __try { > +#define _SEH2_FINALLY } __finally { > +#define _SEH2_EXCEPT(...) } __except(__VA_ARGS__) { > +#define _SEH2_END } > > #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) > #define _SEH2_GetExceptionCode() (GetExceptionCode()) > > >

2 1

Re: [ros-dev] [ros-diffs] [hyperion] 41557: #define inline to __inline for Visual C++ when compiling C sources
by Alex Ionescu 23 Jun '09

23 Jun '09

Why not fix the code instead? I hate these kinds of hacks. GCC understands __inline and static, so just make the code not use STATIC and inline. On 22-Jun-09, at 1:03 PM, hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Tue Jun 23 00:03:20 2009 > New Revision: 41557 > > URL: http://svn.reactos.org/svn/reactos?rev=41557&view=rev > Log: > #define inline to __inline for Visual C++ when compiling C sources > > Modified: > trunk/reactos/ReactOS-generic.rbuild > > Modified: trunk/reactos/ReactOS-generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Jun 23 > 00:03:20 2009 > @@ -132,6 +132,7 @@ > </group> > > <group compilerset="msc"> > + <define name="inline" compiler="cc">__inline</define> > <compilerflag>/Zl</compilerflag> > <compilerflag>/Zi</compilerflag> > <compilerflag>/W1</compilerflag> > Best regards, Alex Ionescu

2 1

Re: [ros-dev] [ros-diffs] [sginsberg] 41436: - In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build. In ReactOS we do this slightly different: DBG is correctly defined to 1 for debug, but not defined at all on non-debug/release build. Because gcc is awesome we can then check for debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have mixed usage all over the tree. - Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DB
by Timo Kreuzer 22 Jun '09

22 Jun '09

sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Wed Jun 17 16:44:05 2009 > New Revision: 41436 > > [...] Because gcc is awesome we can then check for debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have mixed usage all over the tree MSVC behaves exactly the same way ;-P

3 2

Re: [ros-dev] [ros-diffs] [dgorbachev] 41533: Change GDB stub.
by Ged 22 Jun '09

22 Jun '09

You couldn't have made that commit message any less descriptive, even if you'd have just written "Commit something" Hah. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dgorbachev(a)svn.reactos.org Sent: 22 June 2009 12:32 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dgorbachev] 41533: Change GDB stub. Author: dgorbachev Date: Mon Jun 22 15:32:25 2009 New Revision: 41533 URL: http://svn.reactos.org/svn/reactos?rev=41533&view=rev Log: Change GDB stub. Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Mon Jun 22 15:32:25 2009 @@ -11,76 +11,17 @@ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ****************************************************************************/ - /**************************************************************************** - * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ - * - * Module name: remcom.c $ - * Revision: 1.34 $ - * Date: 91/03/09 12:29:49 $ * Contributor: Lake Stevens Instrument Division$ * * Description: low level support for gdb debugger. $ * - * Considerations: only works on target hardware $ - * * Written by: Glenn Engel $ * ModuleState: Experimental $ - * - * NOTES: See Below $ * * Modified for 386 by Jim Kingdon, Cygnus Support. * Modified for ReactOS by Casper S. Hornstrup <chorns(a)users.sourceforge.net> * - * To enable debugger support, two things need to happen. One, setting - * up a routine so that it is in the exception path, is necessary in order - * to allow any breakpoints or error conditions to be properly intercepted - * and reported to gdb. - * Two, a breakpoint needs to be generated to begin communication. - * - * Because gdb will sometimes write to the stack area to execute function - * calls, this program cannot rely on using the supervisor stack so it - * uses it's own stack area. - * - ************* - * - * The following gdb commands are supported: - * - * command function Return value - * - * g return the value of the CPU Registers hex data or ENN - * G set the value of the CPU Registers OK or ENN - * - * mAA..AA,LLLL Read LLLL bytes at address AA..AA hex data or ENN - * MAA..AA,LLLL: Write LLLL bytes at address AA.AA OK or ENN - * - * c Resume at current address SNN ( signal NN) - * cAA..AA Continue at address AA..AA SNN - * - * s Step one instruction SNN - * sAA..AA Step one instruction from AA..AA SNN - * - * k kill - * - * ? What was the last sigval ? SNN (signal NN) - * - * All commands and responses are sent with a packet which includes a - * Checksum. A packet consists of - * - * $<packet info>#<Checksum>. - * - * where - * <packet info> :: <characters representing the command or response> - * <Checksum> :: < two hex digits computed as modulo 256 sum of <packetinfo>> - * - * When a packet is received, it is first acknowledged with either '+' or '-'. - * '+' indicates a successful transfer. '-' indicates a failed transfer. - * - * Example: - * - * Host: Reply: - * $m0,10#2a +$00010203040506070809101112131415#42 - * ****************************************************************************/ #include <ntoskrnl.h> @@ -88,12 +29,8 @@ #include <debug.h> /************************************************************************/ -/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ -/* at least NUMREGBYTES*2 are needed for register packets */ -#define BUFMAX 1000 static BOOLEAN GspInitialized; - static BOOLEAN GspRemoteDebug; static CONST CHAR HexChars[]="0123456789abcdef"; @@ -105,7 +42,12 @@ static FAST_MUTEX GspLock; extern LIST_ENTRY PsActiveProcessHead; -KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ + +/* FIXME hardcoded for COM2, 115200 baud */ +KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; + +static CHAR GspInBuffer[1000]; +static CHAR GspOutBuffer[1000]; /* Number of Registers. */ #define NUMREGS 16 @@ -178,8 +120,6 @@ return -1; } -static CHAR GspInBuffer[BUFMAX]; -static CHAR GspOutBuffer[BUFMAX]; VOID GdbPutChar(UCHAR Value) @@ -199,7 +139,6 @@ } /* scan for the sequence $<data>#<Checksum> */ - PCHAR GspGetPacket() { @@ -221,7 +160,7 @@ Count = 0; /* now, read until a # or end of Buffer is found */ - while (Count < BUFMAX) + while (Count < sizeof(GspInBuffer) - 1) { ch = GdbGetChar(); if (ch == '$') @@ -260,7 +199,6 @@ } /* send the packet in Buffer. */ - VOID GspPutPacket(PCHAR Buffer) { @@ -314,17 +252,23 @@ GdbPutChar(HexChars[Checksum & 0xf]); } -/* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an - error. */ +/* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an error. */ static volatile BOOLEAN GspMemoryError = FALSE; -static volatile void *GspAccessLocation = NULL; static CHAR GspReadMemSafe(PCHAR Address) { - CHAR ch; - KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch); + CHAR ch = 0; + if (!KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch)) + GspMemoryError = TRUE; return ch; +} + +static void +GspWriteMemSafe(PCHAR Address, CHAR Ch) +{ + if (!KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch)) + GspMemoryError = TRUE; } /* Convert the memory pointed to by Address into hex, placing result in Buffer */ @@ -375,7 +319,6 @@ ULONG CountInPage; ULONG i; CHAR ch; - ULONG OldProt = 0; Current = Address; while (Current < Address + Count) @@ -391,30 +334,24 @@ /* Flows into next page, handle only current page in this iteration */ CountInPage = PAGE_SIZE - (Address - Page); } + + for (i = 0; i < CountInPage && ! GspMemoryError; i++) + { + ch = (*GetContent)(Context, Current - Address); + + if (MayFault) + { + GspWriteMemSafe(Current, ch); + } + else + { + *Current = ch; + } + + Current++; + } if (MayFault) { - OldProt = MmGetPageProtect(NULL, Address); - MmSetPageProtect(NULL, Address, PAGE_EXECUTE_READWRITE); - } - - for (i = 0; i < CountInPage && ! GspMemoryError; i++) - { - ch = (*GetContent)(Context, Current - Address); - - if (MayFault) - { - GspAccessLocation = Current; - } - *Current = ch; - if (MayFault) - { - GspAccessLocation = NULL; - } - Current++; - } - if (MayFault) - { - MmSetPageProtect(NULL, Page, OldProt); if (GspMemoryError) { return Current - Address; @@ -432,8 +369,8 @@ HexValue(*((PCHAR) Context + 2 * Offset + 1))); } -/* Convert the hex array pointed to by Buffer into binary to be placed at Address */ -/* Return a pointer to the character AFTER the last byte read from Buffer */ +/* Convert the hex array pointed to by Buffer into binary to be placed at Address + * Return a pointer to the character AFTER the last byte read from Buffer */ static PCHAR GspHex2Mem(PCHAR Buffer, PCHAR Address, @@ -444,49 +381,6 @@ return Buffer + 2 * Count; } - -static void -GspWriteMemSafe(PCHAR Address, - CHAR Ch) -{ - KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch); -} - - -/* This function takes the 386 exception vector and attempts to - translate this number into a unix compatible signal value */ -ULONG -GspComputeSignal(NTSTATUS ExceptionCode) -{ - ULONG SigVal; - - switch (ExceptionCode) - { - case STATUS_INTEGER_DIVIDE_BY_ZERO: - SigVal = 8; /* divide by zero */ - break; - case STATUS_SINGLE_STEP: - case STATUS_BREAKPOINT: - SigVal = 5; /* breakpoint */ - break; - case STATUS_INTEGER_OVERFLOW: - case STATUS_ARRAY_BOUNDS_EXCEEDED: - SigVal = 16; /* bound instruction */ - break; - case STATUS_ILLEGAL_INSTRUCTION: - SigVal = 4; /* Invalid opcode */ - break; - case STATUS_STACK_OVERFLOW: - case STATUS_DATATYPE_MISALIGNMENT: - case STATUS_ACCESS_VIOLATION: - SigVal = 11; /* access violation */ - break; - default: - SigVal = 7; /* "software generated" */ - } - return SigVal; -} - /**********************************************/ /* WHILE WE FIND NICE HEX CHARS, BUILD A LONG */ @@ -932,6 +826,15 @@ GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); } } + else if (strncmp(Request, "Supported", 9) == 0) + { + /* tell maximum incoming packet size */ + sprintf(GspOutBuffer, "PacketSize=%u", sizeof(GspInBuffer) - 1); + } + else if (strncmp(Request, "Rcmd,", 5) == 0) + { + ; + } } VOID @@ -954,6 +857,8 @@ GspOutBuffer[1] = '\0'; } } + +#define DR6_BS 0x00004000 /* Single step */ #define DR7_L0 0x00000001 /* Local breakpoint 0 enable */ #define DR7_G0 0x00000002 /* Global breakpoint 0 enable */ @@ -1011,7 +916,6 @@ #define MAX_SW_BREAKPOINTS 64 static unsigned GspSwBreakpointCount = 0; static GSPSWBREAKPOINT GspSwBreakpoints[MAX_SW_BREAKPOINTS]; -static CHAR GspSwBreakpointsInstructions[MAX_SW_BREAKPOINTS]; static void GspSetHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) @@ -1085,6 +989,21 @@ strcpy(GspOutBuffer, "E22"); } +static BOOLEAN +GspFindSwBreakpoint(ULONG_PTR Address, PULONG PIndex) +{ + ULONG Index; + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + if (GspSwBreakpoints[Index].Address == Address) + { + if (PIndex) *PIndex = Index; + return TRUE; + } + + return FALSE; +} + static void GspSetSwBreakpoint(ULONG_PTR Address) { @@ -1094,61 +1013,44 @@ { DPRINT1("Trying to set too many software breakpoints\n"); strcpy(GspOutBuffer, "E22"); - } - else - { - unsigned Index; - - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - if (GspSwBreakpoints[Index].Address == Address) - { - strcpy(GspOutBuffer, "E22"); - return; - } - } - - DPRINT("Stored at index %u\n", GspSwBreakpointCount); - GspSwBreakpoints[GspSwBreakpointCount].Address = Address; - GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; - GspSwBreakpointsInstructions[GspSwBreakpointCount] = - GspReadMemSafe((PCHAR )Address); - GspWriteMemSafe((PCHAR )Address, 0xCC); - GspSwBreakpointCount++; - strcpy(GspOutBuffer, "OK"); - } + return; + } + + if (GspFindSwBreakpoint(Address, NULL)) + { + strcpy(GspOutBuffer, "E22"); + return; + } + + DPRINT("Stored at index %u\n", GspSwBreakpointCount); + GspSwBreakpoints[GspSwBreakpointCount].Address = Address; + GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; + GspSwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); } static void GspRemoveSwBreakpoint(ULONG_PTR Address) { - unsigned Index; + ULONG Index; DPRINT("GspRemoveSwBreakpoint(0x%p)\n", Address); - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - if (GspSwBreakpoints[Index].Address == Address) - { - DPRINT("Found match at index %u\n", Index); - ASSERT(! GspSwBreakpoints[Index].Active); - - GspWriteMemSafe((PCHAR )Address, - GspSwBreakpointsInstructions[Index]); - - if (Index + 1 < GspSwBreakpointCount) - { - memmove(GspSwBreakpoints + Index, - GspSwBreakpoints + (Index + 1), - (GspSwBreakpointCount - Index - 1) * - sizeof(GSPSWBREAKPOINT)); - memmove(GspSwBreakpointsInstructions + Index, - GspSwBreakpointsInstructions + (Index + 1), - (GspSwBreakpointCount - Index - 1) * sizeof(CHAR)); - } - GspSwBreakpointCount--; - strcpy(GspOutBuffer, "OK"); - return; - } + + if (GspFindSwBreakpoint(Address, &Index)) + { + DPRINT("Found match at index %u\n", Index); + ASSERT(! GspSwBreakpoints[Index].Active); + + if (Index + 1 < GspSwBreakpointCount) + { + memmove(GspSwBreakpoints + Index, + GspSwBreakpoints + (Index + 1), + (GspSwBreakpointCount - Index - 1) * + sizeof(GSPSWBREAKPOINT)); + } + GspSwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; } DPRINT1("Not found\n"); @@ -1195,6 +1097,28 @@ } static void +GspLoadSwBreakpoint(ULONG Index) +{ + GspMemoryError = FALSE; + GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); + if (! GspMemoryError) + { + GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); + } + GspSwBreakpoints[Index].Active = ! GspMemoryError; + if (GspMemoryError) + { + DPRINT1("Failed to set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + } + else + { + DPRINT("Successfully set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + } +} + +static void GspLoadBreakpoints(PKTRAP_FRAME TrapFrame) { unsigned Index; @@ -1202,6 +1126,7 @@ DPRINT("GspLoadBreakpoints\n"); DPRINT("DR7 on entry: 0x%08x\n", TrapFrame->Dr7); + /* Remove all breakpoints */ TrapFrame->Dr7 &= ~(DR7_L0 | DR7_L1 | DR7_L2 | DR7_L3 | DR7_G0 | DR7_G1 | DR7_G2 | DR7_G3 | @@ -1235,47 +1160,22 @@ for (Index = 0; Index < GspSwBreakpointCount; Index++) { - if (GspHwBreakpointCount + Index < MAX_HW_BREAKPOINTS) - { - DPRINT("Implementing software interrupt using hardware register\n"); - GspLoadHwBreakpoint(TrapFrame, GspHwBreakpointCount + Index, - GspSwBreakpoints[Index].Address, 0, - I386_BP_TYPE_EXECUTE); - GspSwBreakpoints[Index].Active = FALSE; - } - else - { - DPRINT("Using real software breakpoint\n"); - GspMemoryError = FALSE; - GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); - if (! GspMemoryError) - { - GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); - } - GspSwBreakpoints[Index].Active = ! GspMemoryError; - if (GspMemoryError) - { - DPRINT1("Failed to set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - } - else - { - DPRINT("Successfully set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - DPRINT1("Successfully set software breakpoint at 0x%p\n", GspSwBreakpoints[Index].Address); - } - } + DPRINT("Using real software breakpoint\n"); + GspLoadSwBreakpoint(Index); } DPRINT("Final DR7 value 0x%08x\n", TrapFrame->Dr7); } static void -GspUnloadBreakpoints(PKTRAP_FRAME TrapFrame) +GspUnloadBreakpoints(void) { unsigned Index; - DPRINT("GspUnloadHwBreakpoints\n"); + DPRINT("GspUnloadBreakpoints\n"); + + /* Disable hardware debugging while we are inside the stub */ + Ke386SetDr7(0); for (Index = 0; Index < GspSwBreakpointCount; Index++) { @@ -1299,9 +1199,67 @@ } } -static BOOLEAN gdb_attached_yet = FALSE; +static void +GspStopReply(NTSTATUS ExceptionCode, PKTRAP_FRAME TrapFrame) +{ + PCHAR ptr = GspOutBuffer; + ULONG SigVal; + LONG Esp; + + switch (ExceptionCode) + { + case STATUS_INTEGER_DIVIDE_BY_ZERO: + SigVal = 8; /* divide by zero */ + break; + case STATUS_SINGLE_STEP: + case STATUS_BREAKPOINT: + SigVal = 5; /* breakpoint */ + break; + case STATUS_INTEGER_OVERFLOW: + case STATUS_ARRAY_BOUNDS_EXCEEDED: + SigVal = 16; /* bound instruction */ + break; + case STATUS_ILLEGAL_INSTRUCTION: + SigVal = 4; /* Invalid opcode */ + break; + case STATUS_STACK_OVERFLOW: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_ACCESS_VIOLATION: + SigVal = 11; /* access violation */ + break; + default: + SigVal = 7; /* "software generated" */ + } + + ptr = GspOutBuffer; + + *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ + *ptr++ = HexChars[(SigVal >> 4) & 0xf]; + *ptr++ = HexChars[SigVal & 0xf]; + + *ptr++ = HexChars[ESP]; + *ptr++ = ':'; + + Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ + ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); + *ptr++ = ';'; + + *ptr++ = HexChars[EBP]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ + *ptr++ = ';'; + + *ptr++ = HexChars[PC]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ + *ptr++ = ';'; + + *ptr = '\0'; +} + + /* - * This function does all command procesing for interfacing to gdb. + * This function does all command procesing for interfacing to GDB. */ KD_CONTINUE_TYPE NTAPI @@ -1309,34 +1267,23 @@ PCONTEXT Context, PKTRAP_FRAME TrapFrame) { - BOOLEAN Stepping; - LONG Address; - LONG Length; - LONG SigVal = 0; - LONG NewPC; - PCHAR ptr; - - /* FIXME: Stop on other CPUs too */ - - if (STATUS_ACCESS_VIOLATION == (NTSTATUS) ExceptionRecord->ExceptionCode && - NULL != GspAccessLocation && - (ULONG_PTR) GspAccessLocation == - (ULONG_PTR) ExceptionRecord->ExceptionInformation[1]) - { - GspAccessLocation = NULL; - GspMemoryError = TRUE; - Context->Eip += 3; - } - else - { - DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); + static BOOLEAN GdbAttached = FALSE; + BOOLEAN Stepping = FALSE; + NTSTATUS ExceptionCode; + LONG Address; + LONG Length; + PCHAR ptr; + + /* FIXME: Stop on other CPUs too */ + + DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); + ExceptionCode = (NTSTATUS) ExceptionRecord->ExceptionCode; + /* Can only debug 1 thread at a time... */ ExAcquireFastMutex(&GspLock); DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); - /* Disable hardware debugging while we are inside the stub */ - Ke386SetDr7(0); - GspUnloadBreakpoints(TrapFrame); + GspUnloadBreakpoints(); /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) @@ -1346,67 +1293,29 @@ GspDbgThread = NULL; } - /* ugly hack to avoid attempting to send status at the very - * beginning, right when GDB is trying to query the stub */ - if (gdb_attached_yet) - { - LONG Esp; - - stop_reply: - /* reply to host that an exception has occurred */ - SigVal = GspComputeSignal(ExceptionRecord->ExceptionCode); - - ptr = GspOutBuffer; - - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = HexChars[(SigVal >> 4) & 0xf]; - *ptr++ = HexChars[SigVal & 0xf]; - - *ptr++ = HexChars[ESP]; - *ptr++ = ':'; - - Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ - ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); - *ptr++ = ';'; - - *ptr++ = HexChars[EBP]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = HexChars[PC]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ - *ptr++ = ';'; - - *ptr = '\0'; - - GspPutPacket(&GspOutBuffer[0]); - /* DPRINT("------- replied status: (%s) -------\n", GspOutBuffer); */ + if (GdbAttached) + { + GspStopReply(ExceptionCode, TrapFrame); + GspPutPacket(GspOutBuffer); + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); } else { - gdb_attached_yet = 1; - } - - Stepping = FALSE; + GdbAttached = TRUE; + } while (TRUE) { /* Zero the buffer now so we don't have to worry about the terminating zero character */ - memset(GspOutBuffer, 0, sizeof(GspInBuffer)); + memset(GspOutBuffer, 0, sizeof(GspOutBuffer)); ptr = GspGetPacket(); - /* DPRINT("------- Get (%s) command -------\n", ptr); */ + // DbgPrint("<<< (%s) <<<\n", ptr); switch(*ptr++) { case '?': /* a little hack to send more complete status information */ - goto stop_reply; - GspOutBuffer[0] = 'S'; - GspOutBuffer[1] = HexChars[SigVal >> 4]; - GspOutBuffer[2] = HexChars[SigVal % 16]; - GspOutBuffer[3] = 0; + GspStopReply(ExceptionCode, TrapFrame); break; case 'd': GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ @@ -1478,7 +1387,7 @@ if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); - DPRINT("Fault during memory read\n"); + DPRINT1("Fault during memory read\n"); } } @@ -1514,7 +1423,7 @@ if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); - DPRINT("Fault during memory write\n"); + DPRINT1("Fault during memory write\n"); } else { @@ -1537,55 +1446,49 @@ case 'c': { ULONG BreakpointNumber; - ULONG dr6_; - - /* try to read optional parameter, pc unchanged if no parm */ + ULONG Dr6; + + /* try to read optional parameter, pc changed if param */ if (GspHex2Long (&ptr, &Address)) { Context->Eip = Address; } - - NewPC = Context->Eip; + else if (ExceptionCode == STATUS_BREAKPOINT) + { + if (GspReadMemSafe((PCHAR) Context->Eip) == (CHAR) I386_OPCODE_INT3) + { + Context->Eip++; + } + } /* clear the trace bit */ - Context->EFlags &= 0xfffffeff; + Context->EFlags &= ~EFLAGS_TF; /* set the trace bit if we're Stepping */ if (Stepping) { - Context->EFlags |= 0x100; + Context->EFlags |= EFLAGS_TF; } -#if defined(__GNUC__) - asm volatile ("movl %%db6, %0\n" : "=r" (dr6_) : ); -#elif defined(_MSC_VER) - __asm mov eax, dr6 __asm mov dr6_, eax; -#else -#error Unknown compiler for inline assembler -#endif - if (!(dr6_ & 0x4000)) + Dr6 = Ke386GetDr6(); + if (!(Dr6 & DR6_BS)) { - for (BreakpointNumber = 0; BreakpointNumber < 4; ++BreakpointNumber) + for (BreakpointNumber = 0; BreakpointNumber < MAX_HW_BREAKPOINTS; ++BreakpointNumber) { - if (dr6_ & (1 << BreakpointNumber)) + if (Dr6 & (1 << BreakpointNumber)) { - if (GspHwBreakpoints[BreakpointNumber].Type == 0) + if (GspHwBreakpoints[BreakpointNumber].Type == I386_BP_TYPE_EXECUTE) { /* Set restore flag */ - Context->EFlags |= 0x10000; + Context->EFlags |= EFLAGS_RF; break; } } } } + GspLoadBreakpoints(TrapFrame); -#if defined(__GNUC__) - asm volatile ("movl %0, %%db6\n" : : "r" (0)); -#elif defined(_MSC_VER) - __asm mov eax, 0 __asm mov dr6, eax; -#else -#error Unknown compiler for inline assembler -#endif + Ke386SetDr6(0); if (NULL != GspDbgThread) { @@ -1596,14 +1499,19 @@ DPRINT("Thread %p releasing mutex\n", PsGetCurrentThread()); ExReleaseFastMutex(&GspLock); DPRINT("Thread %p leaving stub\n", PsGetCurrentThread()); - return kdContinue; - break; + + if (ExceptionCode == STATUS_BREAKPOINT || + ExceptionCode == STATUS_SINGLE_STEP) + { + return kdContinue; + } + + return kdHandleException; } case 'k': /* kill the program */ strcpy(GspOutBuffer, "OK"); break; - /* kill the program */ case 'H': /* Set thread */ GspSetThread(ptr); @@ -1630,11 +1538,11 @@ GspHex2Long(&ptr, &Length); if (0 == Type) { - GspSetSwBreakpoint((ULONG_PTR) Address); + GspSetSwBreakpoint((ULONG_PTR) Address); } else { - GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); + GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } @@ -1652,11 +1560,11 @@ GspHex2Long(&ptr, &Length); if (0 == Type) { - GspRemoveSwBreakpoint((ULONG_PTR) Address); + GspRemoveSwBreakpoint((ULONG_PTR) Address); } else { - GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); + GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } @@ -1667,20 +1575,8 @@ /* reply to the request */ GspPutPacket(GspOutBuffer); - /* DPRINT("------- reply command (%s) -------\n", GspOutBuffer); */ - } - - /* not reached */ - ASSERT(0); - } - - if (NULL != GspDbgThread) - { - ObDereferenceObject(GspDbgThread); - GspDbgThread = NULL; - } - - return kdContinue; + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); + } } @@ -1754,8 +1650,6 @@ /* Initialize the Port */ KdPortInitializeEx(&GdbPortInfo, 0, 0); - - KdpPort = GdbPortInfo.ComPort; } else if (BootPhase == 1) {

1 0

Attention, Visual C++ support developers and fans
by KJK::Hyperion 21 Jun '09

21 Jun '09

I forgot to add to the commit message for r41520 that I lowered the warning level of Visual C++ from -Wall to -W1. This will let us fix the most serious compatibility issues first. Remember: set ROS_RBUILDFLAGS to -dd -Mcmsc, and make --keep-going is your friend. Now go, and make awesome things with this!

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 41421: modified dll/win32/srclient/srclient_main.c ...
by tamlin＠algonet.se 17 Jun '09

17 Jun '09

timo.kreuzer wrote: >This is what I found: [...] So, essentially, what you found is that all versions you looked at, did indeed define va_list if <stdarg.h> was included? -- Mike

2 1

Re: [ros-dev] [ros-diffs] [hyperion] 41421: modified dll/win32/srclient/srclient_main.c ...
by tamlin＠algonet.se 17 Jun '09

17 Jun '09

timo.kreuzer wrote: >In recent ms crt headers, va_list is defined in crtdefs.h, Also in vadefs.h (at least for VC8), which is then (obvious) included by <stdarg.h>. Do you have an example of an MS env. where including stdarg.h does not define va_list? -- Mike

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 41424: - Add Symbol font from Wine
by Steven Edwards 17 Jun '09

17 Jun '09

On Tue, Jun 16, 2009 at 11:41 AM, <dchapyshev(a)svn.reactos.org> wrote: > Author: dchapyshev > Date: Tue Jun 16 19:41:29 2009 > New Revision: 41424 > > URL: http://svn.reactos.org/svn/reactos?rev=41424&view=rev > Log: > - Add Symbol font from Wine Thank you. This will save us a LOT of trouble later with Office applications. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 41421: modified dll/win32/srclient/srclient_main.c What the hell, Arch Blackmann? <windef.h>, <winbase.h> and <winnls.h> are not meant to be included directly. Include <windows.h> instead modified drivers/video/font/ftfd/rosglue.c Move standard C includes before Windows includes, so the required types are defined beforehand modified include/crt/_mingw.h Re-add Visual C++ support va_list is not a built-in type, it does not belong in _mingw.h Do not include intrin.h (screw
by Timo Kreuzer 16 Jun '09

16 Jun '09

hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Tue Jun 16 04:24:26 2009 > New Revision: 41421 > > URL: http://svn.reactos.org/svn/reactos?rev=41421&view=rev > Log: > modified dll/win32/srclient/srclient_main.c > What the hell, Arch Blackmann? <windef.h>, <winbase.h> and <winnls.h> are not meant to be included directly. Include <windows.h> instead > > modified drivers/video/font/ftfd/rosglue.c > Move standard C includes before Windows includes, so the required types are defined beforehand > > modified include/crt/_mingw.h > Re-add Visual C++ support > va_list is not a built-in type, it does not belong in _mingw.h > Do not include intrin.h (screw you, Arch) > Removed definition of _USE_32BIT_TIME_T ("ROS HACK!") > > modified include/crt/conio.h > modified include/crt/stdio.h > modified include/crt/wchar.h > Pull in va_list from stdarg.h > In recent ms crt headers, va_list is defined in crtdefs.h, so it's defined by all headers. This might not fit ANSI C, but that's what ms does. So for compatibility reasons we might want to do it the same way(?)

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 41399: - Implement NdisGeneratePartialCancelId
by Aleksey Bragin 14 Jun '09

14 Jun '09

On Jun 13, 2009, at 9:25 AM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Sat Jun 13 09:25:54 2009 > New Revision: 41399 > +UCHAR > +EXPORT > +NdisGeneratePartialCancelId(VOID) > +{ > + static UCHAR CancelId = 0; > + > + CancelId++; I don't think using static var for this purpose is a great idea. WBR, Aleksey Bragin.

1 0

Re: [ros-dev] Development plans for May
by tamlin＠algonet.se 13 Jun '09

13 Jun '09

aicommander wrote: [...] >The main problem with NDIS 5.1 drivers is the lack of S/G support in HAL > (PRO/100 and PRO/1000 XP drivers are affected by this). Could the follwing info from public MSDN help? If so, it seems to be a rather minor hack to make it work: Scatter/gather DMA Scatter/gather DMA is a shortcut method that sets up several packet DMA transfers at once. If you are transferring a packet over the network, for example, each part of the network stack adds its own header (TCP, IP, Ethernet, and so forth). These headers are all allocated from different places in memory. In this case, the scatter/gather DMA saves time by issuing a batch request to the HAL to map each header plus the data segment for access by the hardware. Instead of having to call the packet DMA routines on each part of the packet, this method calls each routine once, and lets the HAL be responsible for mapping each one individually. Note Scatter/gather capability does not mean that the device can use the scatter/gather routines. Scatter/gather capability refers to a flag in the device description that indicates that the device is able to read or write from any area in memory, instead of just a certain range. -------- What I found to be the interesting (and easily hackable) part was "and lets the HAL be responsible for mapping each one individually". -- Mike

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 41389: - Start services.exe and lsass.exe with above normal priority class
by Ged 12 Jun '09

12 Jun '09

Ok, I've just read the actual code for NtSetInformationProcess (probably should have done that first) It's right, what threw me was your r41390 commit which contained this : + PriorityClass.PriorityClass = PROCESS_PRIORITY_CLASS_HIGH; + PriorityClass.Foreground = FALSE; + + /* Set priority for process */ + if (!NT_SUCCESS(NtSetInformationProcess(ProcessInfo.ProcessHandle, + ProcessPriorityClass, + &PriorityClass, + sizeof(PROCESS_PRIORITY_CLASS)))) + { + DPRINT1("Unable to set process priority for winlogon.exe\n"); + } I assumed from reading this that our NtSetInformationProcess was setting process priorities via #defines. It turns out that the above is actually wrong. From pstypes.h : #define PROCESS_PRIORITY_CLASS_HIGH 3 You were setting winlogon to have a priority of 3. Clearly not right ... heh. Anyway, I see you've reverted it now. Problem solved. I was just writing this follow up so you didn't start looking into NtSetInformationProcess and scratching your head wondering what my previous mail was about Ged. -----Original Message----- From: Ged [mailto:gedmurphy@gmail.com] Sent: 12 June 2009 18:48 To: 'ros-dev(a)reactos.org' Subject: RE: [ros-diffs] [dchapyshev] 41389: - Start services.exe and lsass.exe with above normal priority class Hi This change is wrong. ABOVE_NORMAL_PRIORITY_CLASS sets them to a process level of 10 which is too high. Windows actually runs these at a level of 9 to ensure they get proc time before the regular NORMAL_PRIORITY_CLASS(8) processes but below the ABOVE_NORMAL_PRIORITY_CLASS(10) processes. IIRC, you should be able to set the process directly using NtSetInformationProcess although our implementation doesn't seem to reflect this. Is it our implementation or my memory which is wrong ? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 12 June 2009 16:41 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 41389: - Start services.exe and lsass.exe with above normal priority class Author: dchapyshev Date: Fri Jun 12 19:41:26 2009 New Revision: 41389 URL: http://svn.reactos.org/svn/reactos?rev=41389&view=rev Log: - Start services.exe and lsass.exe with above normal priority class Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Fri Jun 12 19:41:26 2009 @@ -49,7 +49,7 @@ NULL, NULL, FALSE, - DETACHED_PROCESS, + DETACHED_PROCESS | ABOVE_NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, @@ -97,7 +97,7 @@ NULL, NULL, FALSE, - DETACHED_PROCESS, + DETACHED_PROCESS | ABOVE_NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo,

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 41389: - Start services.exe and lsass.exe with above normal priority class
by Ged 12 Jun '09

12 Jun '09

Hi This change is wrong. ABOVE_NORMAL_PRIORITY_CLASS sets them to a process level of 10 which is too high. Windows actually runs these at a level of 9 to ensure they get proc time before the regular NORMAL_PRIORITY_CLASS(8) processes but below the ABOVE_NORMAL_PRIORITY_CLASS(10) processes. IIRC, you should be able to set the process directly using NtSetInformationProcess although our implementation doesn't seem to reflect this. Is it our implementation or my memory which is wrong ? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 12 June 2009 16:41 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 41389: - Start services.exe and lsass.exe with above normal priority class Author: dchapyshev Date: Fri Jun 12 19:41:26 2009 New Revision: 41389 URL: http://svn.reactos.org/svn/reactos?rev=41389&view=rev Log: - Start services.exe and lsass.exe with above normal priority class Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Fri Jun 12 19:41:26 2009 @@ -49,7 +49,7 @@ NULL, NULL, FALSE, - DETACHED_PROCESS, + DETACHED_PROCESS | ABOVE_NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, @@ -97,7 +97,7 @@ NULL, NULL, FALSE, - DETACHED_PROCESS, + DETACHED_PROCESS | ABOVE_NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo,

1 0

Development plans for May
by Aleksey Bragin 12 Jun '09

12 Jun '09

Hi, as we earlier discussed, there is an idea to make 0.3.10 a "hardware- compatibility" release. There is a full list of 0.3.10 milestones bugs linked from our roadmap page, but here are some possible directions for work: - USB support for keyboard and mouse devices. Right now, it needs fixing the rare crash during booting (bug is bugzilled, comment explaining how to solve the problem is attached, some investigation remains), and more testing on real hardware. - Uniata support: it solves many problems at once, such as a stupid 8Gb limit which is a nonsense for a 2009-year operating system, and Serial ATA support, which greatly enhances possible ReactOS usability (along with the first item of this list). I use it in my builds everyday for more than a month, it works very good. Problems: VirtualBox CDROM support (it doesn't recognize it), on my realhardware it also experiences similar problems. Bug is also bugzilled, a lot of debug logs attached, so everyone can participate. - Common NICs support: Cameron is doing great work, testers too. There are some outstanding problems, which you can see from http:// www.reactos.org/wiki/index.php/Supported_Hardware/Network_cards - Sound support: Johannes knows best, but getting any progress with sound by 0.3.10 release date is greatly appreciated. - Videocards support: Olaf performs some tesitng and bugreporting. Third party drivers support is rather weak, http://www.reactos.org/ wiki/index.php/Supported_Hardware/Video_cards , and usually is limited by VMWare's video driver which is being one of the most supported through the ReactOS development history. Besides of that, Olaf is organizing the Golden Apps testing, so that we won't discover regressions occasionally or by the time the release is branched and everyone is awaiting, but instead that's going to happen on a periodical basis, and he's going to manage this process with help of our fellow testers. Target 0.3.10 release date is month from now on - that means, somewhere in the end of May. Certainly, if our goals aren't met, the release is going to be rescheduled and that's it, but, I'd like to ask to concentrate on the above problems first. They are hard to solve when every problem is being approached by one person, but with a common effort they aren't going to be a problem. Any new developers - welcome! There are very definite goals, enough of information, so please feel free to join and help. With the best regards, Aleksey Bragin.

5 5

Re: [ros-dev] Development plans for May
by Olaf Siejka 11 Jun '09

11 Jun '09

As for Videocards, it seems that our situation is not as bad as it was perceived before. Its not perfect, of course. - currently i can name at least 3 cards working on my ReactOS PC with native XP drivers: ATI Rage II+, Matrox G100 and Matrox G400. With considerable cerainty i can say that all Matrox models inbetween or bit newer than afforementioned model range will also be working, as they are using same driver package; - all vesa 2.0 videocards i tested are working correctly with our VESA driver. Only single cases have issues here; We still have a number of bugs in this area, for your consideration: - lack of VESA 1.2 support: this locks up older PCI cards, like whole S3 family (up to savage) to VGA driver. Only workaround is to use native XP drivers. It succeeded with S3 Trio 64, but uncovered another bug listed belo; (bug no.4447) - if XP video driver is installed (by slipstreaming into bootcd) on installation with VGA driver selected in 1st stage, even though XP driver is loaded, the system will be locked to VGA mode (640x480x4bpp unchangeable). This one is not yet submitted as it needs to be confirmed by other tester first; - VGA driver, if picked in 1st stage, jumps back to VESA on 3rd stage boot. This can be rigged away by replacing VESA driver with vga driver files, leaving the filenames of the former (bug no. - Some Windows VGA drivers will cause ASSERT in Videoprt. In many cases this ASSERT may be cont-ed without any visible side-effect, yet it requires more attention (bug no.4354); - our opengl setup requires only specific opengl setup (bug no. 4574); - Matrox G400 opengl ICD is not cooperating well with our opengl32.dll (fails when DrvDescribePixelFormat is called from the icd), requires more attention and a way to instert breakpoint within ReactOS to an dll that has not been loaded yet, namely a working debugger like Olly); I am also preparing to create a support page for I/O controllers, as soon as i get some components for a few entries.

1 0

Help me test Visual C++ support
by KJK::Hyperion 10 Jun '09

10 Jun '09

As of r41374, Visual C++ suppport in rbuild is almost fully functional (PCH and full dependencies - i.e. rbuild -df - won't work yet. Also, the Microsoft linker is not supported yet). All I need now is people working to make sources compile with it. How to: add option -Mcmsc to variable ROS_RBUILDFLAGS: set ROS_RBUILDFLAGS=%ROS_RBUILDFLAGS% -Mcmsc and build modules! make --keep-going will be very useful for the time being. Now start fixing shit, for the love of god! go go go!

1 0

Help me test Visual C++ support
by KJK::Hyperion 08 Jun '09

08 Jun '09

So you want to make Visual C++ building support a reality. Good. Do you have Visual Studio, Visual C++ Express or any flavor of the DDK? Do you have trunk checked out and updated? Even better. Do the following from a RosBE prompt: * del makefile.auto * set ROS_RBUILDFLAGS=-Mmicrosoft * make rbuild and reply to this message with: * what version of Visual Studio, Visual C++ Express or the DDK you installed * the output of the "[RBUILD] makefile.auto" phase To clean up and resume building as usual: * del makefile.auto * set ROS_RBUILDFLAGS= Thank you

7 6

Help me test Visual C++ support
by victor martinez 08 Jun '09

08 Jun '09

> * what version of Visual Studio, Visual C++ Express or the DDK you > installed Microsoft Visual Studio 2005 Version 8.0.50727.867 (vsvista.050727-8600) > * the output of the "[RBUILD] makefile.auto" phase [RBUILD] makefile.auto Reading build files...done Detecting compiler...detected (cl 14.0.50727.762) Detecting binutils...detected (link 8.0.50727.762) Detecting netwide assembler...detected (nasm 2.05.01) Detecting compiler pre-compiled header support...disabled Processing modules...done Creating directories...done Generating test support code...done Generating compilation unit support code...done Generating syssetup.inf...done Generating proxy makefiles...done Checking automatic dependencies...done Regards, Victor. _________________________________________________________________ Descubre todas las formas en que puedes estar en contacto con amigos y familiares. http://www.microsoft.com/windows/windowslive/default.aspx

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 41344: Fix no-op code for UNIX hosts
by Steven Edwards 08 Jun '09

08 Jun '09

On Sun, Jun 7, 2009 at 7:39 PM, <hyperion(a)svn.reactos.org> wrote: > +#include "../../pch.h" This is really minor but can you fix it by changing the -I path? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 2

Re: [ros-dev] [ros-diffs] [hyperion] 41343: modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/mingw.h From now on, the MinGW back-end will also support the Microsoft command line C/C++ compiler (cl) and incremental linker (link)
by Steven Edwards 08 Jun '09

08 Jun '09

On Sun, Jun 7, 2009 at 7:33 PM, <hyperion(a)svn.reactos.org> wrote: > +#include "../../pch.h" Ditto for here. > + > +// TODO? attempt to support Microsoft tools on non-Windows? > +#if !defined(WIN32) > + > +bool > +MingwBackend::DetectMicrosoftCompiler ( std::string& ) > +{ > + return false; > +} There are some crazy people that run cl under Wine. I know older versions such as the vctoolkit worked. I'm not sure about more recent revs. I'm happy to try to make time to look in to this at some point. It would be nice for us Linux and OS X users to be able to verify things from time to time with msvc without needing a fullblown vm. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Old Code in User32
by James Tabor 05 Jun '09

05 Jun '09

Hi all! I noticed we still have drawing issues even after fixing some gdi code. Well, I guess we need to look at the main windowing side of the house now. I guess, based on a stable release we can sync up wine and patch by hand the forked code too. I know of some Delphi issues that could use a good non static update. Bulk of our user code is from wine and that includes the window positioning bug everyone has had a crack at as well. I notices that most of the syncs in comdlg/controls depend on user code updates. If Richedit breaks windowing, it could be related to user32/win32k code not updated or based on behavior that is wrong. Syncing and updating forked code is not fun, with both, one needs to take into account local fixes. When you find them, mark them like "REACTOS HACK" or "REACTOS ONLY" or "REACTOS ????" what ever. Reading the change logs for each file should help with determining local patches that have been applied and need to be taken into account as well. If you have a bug report, please mark it as WINE SYNC or WINE UPDATE, something to let us know, it's a wine sync of some kind. We have a file in our media doc directory that holds the sync/fork information, please include it with your updates. Thanks, James Ref: README.WINE: User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/scrollbar.c # Forked reactos/dll/win32/user32/controls/static.c # Synced at 20071024 reactos/dll/win32/user32/misc/dde.c # Synced to wine 1.1.17 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced to wine 1.1.17 reactos/dll/win32/user32/misc/ddeserver.c # Synced to wine 1.1.17 reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown reactos/dll/win32/user32/misc/resources.c # Forked? reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown reactos/dll/win32/user32/misc/wsprintf.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/dll/win32/user32/windows/mdi.c # Synced at 20060703 reactos/dll/win32/user32/windows/menu.c # Forked reactos/dll/win32/user32/windows/messagebox.c # Forked reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) reactos/dll/win32/user32/windows/winpos.c # Forked

1 0

Re: [ros-dev] [ros-diffs] [jimtabor] 41250: - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup.
by Timo Kreuzer 05 Jun '09

05 Jun '09

This looks like ultra-hax. Can you explain why this should be correct? It would mean DrvSetPixelFormat would be passed a SURFACE rather than a SURFOBJ. jimtabor(a)svn.reactos.org schrieb: > Author: jimtabor > Date: Tue Jun 2 10:50:36 2009 > New Revision: 41250 > > URL: http://svn.reactos.org/svn/reactos?rev=41250&view=rev > Log: > - Hax-implement NtGdiSetPixelFormat and add a support function UserGethWnd with some code cleanup. > > Modified: > [...] > + /* > + Based on some rules! InfoDC to DC or, based on wiki information! > + All pointers, it's a "must be!", (CONTAINING_RECORD +10h = SURFOBJ), the > + pointer will start at SURFOBJ of the SURFACE structure. > + */ > + pso = (SURFOBJ *)pdc->dclevel.pSurface; > + if (!pso) pso = pdc->pSurfInfo; > + if (!pso) pso = ppdev->pSurface; > + } > + > + if (ppdev->flFlags & PDEV_META_DEVICE) > + { > + UNIMPLEMENTED; > + goto Exit; > + } > + > + if (ppdev->DriverFunctions.SetPixelFormat) > + { > + Ret = ppdev->DriverFunctions.SetPixelFormat( > + pso, > + ipfd, > + hWnd); > + } >

2 3

Re: [ros-dev] [ros-diffs] [dgorbachev] 41284: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581.
by Aleksey Bragin 04 Jun '09

04 Jun '09

He has write access (sginsberg), however he posted that to bugzilla for peer review and comments before committing, not because he lacks time to commit himself. WBR, Aleksey Bragin. On Jun 4, 2009, at 5:54 PM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Thu Jun 4 17:54:27 2009 > New Revision: 41284 > > URL: http://svn.reactos.org/svn/reactos?rev=41284&view=rev > Log: > Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, > bug #4581. > > Modified: > trunk/reactos/drivers/video/miniport/vbe/vbemp.c > trunk/reactos/ntoskrnl/ke/bug.c > > Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/ > miniport/vbe/vbemp.c?rev=41284&r1=41283&r2=41284&view=diff > ====================================================================== > ======== > --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] > (original) > +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] > Thu Jun 4 17:54:27 2009 > @@ -546,56 +546,8 @@ > ULONG Columns, > ULONG Rows) > { > - INT10_BIOS_ARGUMENTS BiosRegisters; > - PVBE_DEVICE_EXTENSION VBEDeviceExtension = > - (PVBE_DEVICE_EXTENSION)DeviceExtension; > - > - if (!VBEResetDevice(DeviceExtension, NULL)) > - return FALSE; > - > - /* Change number of columns/rows */ > - VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); > - > - if (Columns == 80 && Rows == 25) > - { > - /* Default text size, don't change anything. */ > - return TRUE; > - } > - else if (Columns == 80 && Rows == 28) > - { > - /* Use 9x14 font (80x28) */ > - BiosRegisters.Eax = 0x1111; > - } > - else if (Columns == 80 && Rows == 43) > - { > - /* Use 8x8 font in 350 scans mode (80x43) */ > - BiosRegisters.Eax = 0x1201; > - BiosRegisters.Ebx = 0x30; > - VBEDeviceExtension->Int10Interface.Int10CallBios( > - VBEDeviceExtension->Int10Interface.Context, > - &BiosRegisters); > - > - BiosRegisters.Eax = 0x3; > - BiosRegisters.Ebx = 0; > - VBEDeviceExtension->Int10Interface.Int10CallBios( > - VBEDeviceExtension->Int10Interface.Context, > - &BiosRegisters); > - > - BiosRegisters.Eax = 0x1112; > - } > - else if (Columns == 80 && Rows == 50) > - { > - /* Use 8x8 font (80x50) */ > - BiosRegisters.Eax = 0x1112; > - } > - else > - return FALSE; > - > - VBEDeviceExtension->Int10Interface.Int10CallBios( > - VBEDeviceExtension->Int10Interface.Context, > - &BiosRegisters); > - > - return TRUE; > + /* Return FALSE to let HAL reset the display with INT10 */ > + return FALSE; > } > > /* > > Modified: trunk/reactos/ntoskrnl/ke/bug.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ > bug.c?rev=41284&r1=41283&r2=41284&view=diff > ====================================================================== > ======== > --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Jun 4 > 17:54:27 2009 > @@ -1138,13 +1138,11 @@ > #endif > > /* Display the BSOD */ > - KeLowerIrql(APC_LEVEL); // This is a nastier hack than any > ever before > KiDisplayBlueScreen(MessageId, > IsHardError, > HardErrCaption, > HardErrMessage, > AnsiName); > - KeRaiseIrql(HIGH_LEVEL, &OldIrql); > > /* Check if the debugger is disabled but we can enable it */ > if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) >

1 0

how to use the macro CHECKPOINT
by Zhang Fan 04 Jun '09

04 Jun '09

I find the defination of CHECKPOINT #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); ExAllocatePool(NonPagedPool,0); } while(0); I don't know why alloc memory with 0 byte

1 0

Re: [ros-dev] [ros-diffs] [mjmartin] 41269: - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we.
by Alex Ionescu 03 Jun '09

03 Jun '09

I must say that I protest to all the recent I/O changes, and in my opinion, they are all wrong and badly researched, and have hacked what was once good code. Best regards, Alex Ionescu On Wed, Jun 3, 2009 at 2:48 AM, <mjmartin(a)svn.reactos.org> wrote: > Author: mjmartin > Date: Wed Jun 3 13:48:33 2009 > New Revision: 41269 > > URL: http://svn.reactos.org/svn/reactos?rev=41269&view=rev > Log: > - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we. > > 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 [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Jun 3 13:48:33 2009 > @@ -1302,7 +1302,7 @@ > RtlZeroMemory(DriverObject, ObjectSize); > DriverObject->Type = IO_TYPE_DRIVER; > DriverObject->Size = sizeof(DRIVER_OBJECT); > - DriverObject->Flags = DRVO_BUILTIN_DRIVER; > + DriverObject->Flags = DRVO_LEGACY_DRIVER;//DRVO_BUILTIN_DRIVER; > DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); > DriverObject->DriverExtension->DriverObject = DriverObject; > DriverObject->DriverInit = InitializationFunction; > @@ -1398,6 +1398,14 @@ > { > /* Returns to caller the object */ > *pDriverObject = DriverObject; > + } > + > + /* Loop all Major Functions */ > + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > + { > + /* Set each function that was set to NULL to internal routine */ > + if (!DriverObject->MajorFunction[i]) > + DriverObject->MajorFunction[i] = IopInvalidDeviceRequest; > } > > /* Return the Status */ > >

3 2

Re: [ros-dev] [ros-diffs] [cgutman] 41213: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code
by Alex Ionescu 02 Jun '09

02 Jun '09

There's nothing ugly about this -- this is exactly what the field is for. Best regards, Alex Ionescu On Sat, May 30, 2009 at 4:07 PM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Sun May 31 03:07:13 2009 > New Revision: 41213 > > URL: http://svn.reactos.org/svn/reactos?rev=41213&view=rev > Log: > - Export and hackplement NdisSetTimerEx > - Implementation is #ifed out currently but I may enable it later > - Hopefully somebody can think of a better way to do it than the current code > > Modified: > trunk/reactos/drivers/network/ndis/ndis.def > trunk/reactos/drivers/network/ndis/ndis/time.c > > Modified: trunk/reactos/drivers/network/ndis/ndis.def > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… > ============================================================================== > --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 03:07:13 2009 > @@ -257,6 +257,7 @@ > NdisSetPacketPoolProtocolId@8 > ;NdisSetProtocolFilter ? > NdisSetTimer@8 > +NdisSetTimerEx@12 > NdisSetupDmaTransfer@24 > NdisSystemProcessorCount@0 > NdisTerminateWrapper@8 > > Modified: trunk/reactos/drivers/network/ndis/ndis/time.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… > ============================================================================== > --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun May 31 03:07:13 2009 > @@ -243,5 +243,26 @@ > KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); > } > > +VOID > +EXPORT > +NdisSetTimerEx( > + IN PNDIS_TIMER Timer, > + IN UINT MillisecondsToDelay, > + IN PVOID FunctionContext) > +{ > +#if 0 > + /* FIXME: I'm not sure how to this in a nice way > + * We can't store the function context anywhere in NDIS_TIMER > + * so I'm forced to do this > + */ > + > + Timer->Dpc.DeferredContext = FunctionContext; > + > + NdisSetTimer(Timer, MillisecondsToDelay); > +#else > + UNIMPLEMENTED > +#endif > +} > + > /* EOF */ > > >

1 0

ReactOS debug on bochs
by Fan Zhang 01 Jun '09

01 Jun '09

Hi I download a very early edtion of reactos(0.0.21), I think it would be easy to understand for me. I disable the NDEBUG macro, so I can catch the debug info. By default, I use the /DEBUGPORT=SCREEN, and the log info is printed on the screen. Then I changed to /DEBUGPORT=BOCHS, but there is no any info on the bochs console. Could you tell me how to catch the log on the bochs? Fan Zhang

1 0

Re: [ros-dev] [ros-diffs] [spetreolle] 41204: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0.
by Ged 30 May '09

30 May '09

This seems very strange -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of spetreolle(a)svn.reactos.org Sent: 30 May 2009 13:23 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [spetreolle] 41204: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0. Author: spetreolle Date: Sat May 30 16:23:20 2009 New Revision: 41204 URL: http://svn.reactos.org/svn/reactos?rev=41204&view=rev Log: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0. Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sat May 30 16:23:20 2009 @@ -493,7 +493,10 @@ LPDEVMODEA lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + LONG Status = ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; } @@ -533,5 +536,8 @@ LPDEVMODEW lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); -} + LONG Status = ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; +}

2 2

Re: [ros-dev] [ros-diffs] [dgorbachev] 41153: Do not assign twice to the same variable.
by Ged 27 May '09

27 May '09

Did you mean to remove IRP_MJ_CLEANUP? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dgorbachev(a)svn.reactos.org Sent: 27 May 2009 21:27 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dgorbachev] 41153: Do not assign twice to the same variable. Author: dgorbachev Date: Thu May 28 00:27:09 2009 New Revision: 41153 URL: http://svn.reactos.org/svn/reactos?rev=41153&view=rev Log: Do not assign twice to the same variable. Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -104,7 +104,7 @@ ControllerProperties->SupportedTransferMode[0][0] = ControllerProperties->SupportedTransferMode[0][1] = ControllerProperties->SupportedTransferMode[1][0] = - ControllerProperties->SupportedTransferMode[1][0] = + ControllerProperties->SupportedTransferMode[1][1] = PIO_MODE0 | PIO_MODE1 | PIO_MODE2 | PIO_MODE3 | PIO_MODE4 | SWDMA_MODE0 | SWDMA_MODE1 | SWDMA_MODE2 | MWDMA_MODE0 | MWDMA_MODE1 | MWDMA_MODE2 | Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -1082,7 +1082,6 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch;

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 41115: - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE
by Timo Kreuzer 25 May '09

25 May '09

Ok before you go on in this area, I am currently working on a complete rewrite of sysparams stuff. It should hopefully be ready this week and should fix almost all winetests and additional tests in this area. Regards, Timo dchapyshev(a)svn.reactos.org schrieb: > Author: dchapyshev > Date: Mon May 25 17:08:57 2009 > New Revision: 41115 > > URL: http://svn.reactos.org/svn/reactos?rev=41115&view=rev > Log: > - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon May 25 17:08:57 2009 > @@ -699,6 +699,22 @@ > { > ASSERT(pvParam); > *((BOOL*)pvParam) = IntIsFontRenderingEnabled(); > + break; > + } > + case SPI_SETFONTSMOOTHINGTYPE: > + { > + if (*((UINT*)pvParam) == FE_FONTSMOOTHINGCLEARTYPE) > + { > + DPRINT1("ReactOS does not support ClearType smoothing but it is returned TRUE\n"); > + } > + bChanged = TRUE; > + break; > + } > + case SPI_GETFONTSMOOTHINGTYPE: > + { > + /* We do not support ClearType. Only standard smoothing */ > + DPRINT1("ReactOS does not support ClearType smoothing. Returned FE_FONTSMOOTHINGSTANDARD\n"); > + *((UINT*)pvParam) = FE_FONTSMOOTHINGSTANDARD; > break; > } > case SPI_GETICONTITLELOGFONT: > > >

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 41113: - Disable Wow64* functions for x86 build
by Timo Kreuzer 25 May '09

25 May '09

BTW: there's a way to do this in normal spec files. It would be @ stdcall -arch=x86_64 Wow64EnableWow64FsRedirection(long) i386, x86_64, sparc, alpha and powerpc are supported Multiple architectures can be sperated with comma. Timo dchapyshev(a)svn.reactos.org schrieb: > Author: dchapyshev > Date: Mon May 25 15:01:16 2009 > New Revision: 41113 > > URL: http://svn.reactos.org/svn/reactos?rev=41113&view=rev > Log: > - Disable Wow64* functions for x86 build > > Modified: > trunk/reactos/dll/win32/kernel32/kernel32.pspec > > Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Mon May 25 15:01:16 2009 > @@ -950,9 +950,11 @@ > @ stdcall WaitNamedPipeW (wstr long) > @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) > @ stdcall WinExec(str long) > +#ifdef _M_AMD64 > @ stdcall Wow64EnableWow64FsRedirection(long) > @ stdcall Wow64DisableWow64FsRedirection(long) > @ stdcall Wow64RevertWow64FsRedirection(long) > +#endif > @ stdcall WriteConsoleA(long ptr long ptr ptr) > @ stdcall WriteConsoleInputA(long ptr long ptr) > @ stdcall WriteConsoleInputVDMA(long long long long) > > >

1 0

WineHQ vs ReactOS Winetest Comparator.WIRECo
by victor martinez 25 May '09

25 May '09

Hi.. I have had an idea which i want to share with you, so we can discuss if it is interesting or stupid enough. Right now we have a Winetests comparator called TestMan thanks to the efforts of Colin and Lone_Rifle. This script compares the Winetest results of different revisions. It is really helpful to find regressions(Thanks Lone_rifle to be supervising them from time to time :) ). My idea is about creating/adding a new script which compares the winetest results of a ReactOS revision vs the result of the WineHQ winetests. Of course just in those functions/modules that we have full-synced with Wine. Why? Lets imagine that our Wininit:FTP functions are synced(as they are).That means that the code of those functions are the same in Wine and in ReactOS. That means that Bugs present in that code will be present in ReactOS too.These could be called the Expected bugs.ReactOS should fail in these tests since Wine functions are bugged: call them Expected Fails. But sometimes ReactOS is showing more fails than the Expected Fails( in synced code).Why? Well, these synced functions use other deeper functions which arent synced with Wine and which is own ReactOS code.And, of course,which can have Bugs.If these deeper functions arent working properlly then affects the synced functions which uses them and then you will see extra tests failing. Lets give a small example. Wininit:FTP is synced with Wine. WineHQ reports 6 failures : http://test.winehq.org/data/b175a43fb8439a33a686512935597d4c43c19733/wine_w… ReactOS latest rev reports 19 failures: http://79.99.5.181/testman/detail.php?id=141321 These 13 extra failures arent expected.We expect just 6 Expected Fails (which seems to be related with Bugs in Wine code), so this 13 extra failures are related with deeper functions (which are ReactOS own code). So the New Script would check the failures in WineHQ and in ReactOS rev and warn when the number of failures is higher than the number of Expected failures,showing also the differences, so the New Script can easily point our Devs towards ReactOS bugs, helping he "hunting" giving "clues" to them. If my reasoning is wrong,or i am missing something,please tell me. :) How much useful would be this Script?Is it interesting enough for Developing purposes?or Is it a waste of time/efforts? Note: The ie is Bugzilled.It´s curious,since doing a small Timing trick you can have the 6 Expected Fails instead the 19 failures. http://www.reactos.org/bugzilla/show_bug.cgi?id=4533 Vicmarcal _________________________________________________________________ ¡Acelera con la Fórmula 1! Juega y demuestra lo que sabes con MSN Deportes http://msn.es.predictorpro.com/grand-prix/overview.aspx?season=8

1 0

Re: [ros-dev] Silverblade
by Olaf Siejka 25 May '09

25 May '09

Well mate, pity to hear that! As you well know, one cannot simply leave this project! So everyone`s gonna be glad to see you lurking around! Best regards

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 41106: MmGrowKernelStack: go back to the ASSERT and add a fixed check
by Alex Ionescu 25 May '09

25 May '09

Sorry for not replying to e-mails about this -- I was on vacation on a cruise. When I'm back to Montreal I'll write a driver to test if this is correct or not -- but definitely this is better. Best regards, Alex Ionescu On Mon, May 25, 2009 at 1:17 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon May 25 03:17:48 2009 > New Revision: 41106 > > URL: http://svn.reactos.org/svn/reactos?rev=41106&view=rev > Log: > MmGrowKernelStack: go back to the ASSERT and add a fixed check > > Modified: > trunk/reactos/ntoskrnl/mm/procsup.c > > Modified: trunk/reactos/ntoskrnl/mm/procsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon May 25 03:17:48 2009 > @@ -258,11 +258,15 @@ > { > PETHREAD Thread = PsGetCurrentThread(); > > - /* Make sure we have reserved space for our grow */ > - if (((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > > - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)) > - { > - return STATUS_NO_MEMORY; > + /* Make sure the stack did not overflow */ > + ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= > + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); > + > + /* Check if we have reserved space for our grow */ > + if ((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit + > + KERNEL_STACK_SIZE > KERNEL_LARGE_STACK_SIZE) > + { > + return STATUS_STACK_OVERFLOW; > } > > /* > >

1 0

Re: [ros-dev] [ros-diffs] [cwittich] 41093: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details.
by Ged 25 May '09

25 May '09

Is this really right? I haven't checked the call chain in Windows, but 'A' functions generally call their 'W' counterpart to do the work. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cwittich(a)svn.reactos.org Sent: 24 May 2009 09:45 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cwittich] 41093: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details. Author: cwittich Date: Sun May 24 12:45:05 2009 New Revision: 41093 URL: http://svn.reactos.org/svn/reactos?rev=41093&view=rev Log: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun May 24 12:45:05 2009 @@ -3964,110 +3964,96 @@ * * @implemented */ -LONG WINAPI -RegQueryValueExA(HKEY hKey, - LPCSTR lpValueName, - LPDWORD lpReserved, - LPDWORD lpType, - LPBYTE lpData, - LPDWORD lpcbData) -{ - UNICODE_STRING ValueName; - UNICODE_STRING ValueData; - ANSI_STRING AnsiString; - LONG ErrorCode; - DWORD Length; - DWORD Type; - - TRACE("hKey 0x%X lpValueName %s lpData 0x%X lpcbData %d\n", - hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); - - if (lpData != NULL && lpcbData == NULL) - { - return ERROR_INVALID_PARAMETER; - } - - if (lpData) - { - ValueData.Length = 0; - ValueData.MaximumLength = (*lpcbData + 1) * sizeof(WCHAR); - ValueData.Buffer = RtlAllocateHeap(ProcessHeap, - 0, - ValueData.MaximumLength); - if (!ValueData.Buffer) - { - return ERROR_OUTOFMEMORY; - } - } - else - { - ValueData.Buffer = NULL; - ValueData.Length = 0; - ValueData.MaximumLength = 0; - - if (lpcbData) - *lpcbData = 0; - } - - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (LPSTR)lpValueName); - - Length = (lpcbData == NULL) ? 0 : *lpcbData * sizeof(WCHAR); - ErrorCode = RegQueryValueExW(hKey, - ValueName.Buffer, - lpReserved, - &Type, - (lpData == NULL) ? NULL : (LPBYTE)ValueData.Buffer, - &Length); - TRACE("ErrorCode %lu\n", ErrorCode); - RtlFreeUnicodeString(&ValueName); - - if (ErrorCode == ERROR_SUCCESS || - ErrorCode == ERROR_MORE_DATA) - { - if (lpType != NULL) - { - *lpType = Type; - } - - if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) - { - if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) +LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, + LPBYTE data, LPDWORD count ) +{ + NTSTATUS status; + ANSI_STRING nameA; + DWORD total_size, datalen = 0; + char buffer[256], *buf_ptr = buffer; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", + hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); + + if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + + status = MapDefaultKey( (PHANDLE)&hkey, hkey); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + if (count) datalen = *count; + if (!data && count) *count = 0; + + /* this matches Win9x behaviour - NT sets *type to a random value */ + if (type) *type = REG_NONE; + + RtlInitAnsiString( &nameA, name ); + if ((status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, + &nameA, FALSE ))) + return RtlNtStatusToDosError(status); + + status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, + KeyValuePartialInformation, buffer, sizeof(buffer), &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + + /* we need to fetch the contents for a string type even if not requested, + * because we need to compute the length of the ASCII string. */ + if (data || is_string(info->Type)) + { + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) + { + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) { - RtlInitAnsiString(&AnsiString, NULL); - AnsiString.Buffer = (LPSTR)lpData; - AnsiString.MaximumLength = *lpcbData; - ValueData.Length = Length; - ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR); - RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); + status = STATUS_NO_MEMORY; + goto done; } - - Length = Length / sizeof(WCHAR); - } - else if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) - { - if (*lpcbData < Length) + info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; + status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, + KeyValuePartialInformation, buf_ptr, total_size, &total_size ); + } + + if (status) goto done; + + if (is_string(info->Type)) + { + DWORD len; + + RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info_size), + total_size - info_size ); + if (data && len) { - ErrorCode = ERROR_MORE_DATA; + if (len > datalen) status = STATUS_BUFFER_OVERFLOW; + else + { + RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size), + total_size - info_size ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (len < datalen && data[len-1]) data[len] = 0; + } } - else - { - RtlMoveMemory(lpData, ValueData.Buffer, Length); - } - } - - if (lpcbData != NULL) - { - *lpcbData = Length; - } - } - - if (ValueData.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer); - } - - return ErrorCode; + total_size = len + info_size; + } + else if (data) + { + if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info_size, total_size - info_size ); + } + } + else status = STATUS_SUCCESS; + + if (type) *type = info->Type; + if (count) *count = total_size - info_size; + + done: + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + return RtlNtStatusToDosError(status); } @@ -4098,7 +4084,6 @@ (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - //if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; status = MapDefaultKey(&hkey, hkeyorg); if (!NT_SUCCESS(status)) @@ -4162,93 +4147,27 @@ * * @implemented */ -LONG WINAPI -RegQueryValueA(HKEY hKey, - LPCSTR lpSubKey, - LPSTR lpValue, - PLONG lpcbValue) -{ - WCHAR SubKeyNameBuffer[MAX_PATH+1]; - UNICODE_STRING SubKeyName; - UNICODE_STRING Value; - ANSI_STRING AnsiString; - LONG ValueSize; - LONG ErrorCode; - - TRACE("hKey 0x%X lpSubKey %s lpValue %p lpcbValue %d\n", - hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); - - if (lpValue != NULL && - lpcbValue == NULL) - { - return ERROR_INVALID_PARAMETER; - } - - RtlInitUnicodeString(&SubKeyName, - NULL); - RtlInitUnicodeString(&Value, - NULL); - if (lpSubKey != NULL && - strlen(lpSubKey) != 0) - { - RtlInitAnsiString(&AnsiString, - (LPSTR)lpSubKey); - SubKeyName.Buffer = &SubKeyNameBuffer[0]; - SubKeyName.MaximumLength = sizeof(SubKeyNameBuffer); - RtlAnsiStringToUnicodeString(&SubKeyName, - &AnsiString, - FALSE); - } - - if (lpValue != NULL) - { - ValueSize = *lpcbValue * sizeof(WCHAR); - Value.MaximumLength = ValueSize; - Value.Buffer = RtlAllocateHeap(ProcessHeap, - 0, - ValueSize); - if (Value.Buffer == NULL) - { - return ERROR_OUTOFMEMORY; - } - } - else - { - ValueSize = 0; - } - - ErrorCode = RegQueryValueW(hKey, - (LPCWSTR)SubKeyName.Buffer, - Value.Buffer, - &ValueSize); - if (ErrorCode == ERROR_SUCCESS) - { - if (lpValue != NULL) - { - Value.Length = ValueSize; - RtlInitAnsiString(&AnsiString, - NULL); - AnsiString.Buffer = lpValue; - AnsiString.MaximumLength = *lpcbValue; - RtlUnicodeStringToAnsiString(&AnsiString, - &Value, - FALSE); - *lpcbValue = ValueSize; - } - else if (lpcbValue != NULL) - { - *lpcbValue = ValueSize; - } - } - - if (Value.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - Value.Buffer); - } - - return ErrorCode; +LSTATUS WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count ) +{ + DWORD ret; + HKEY subkey = hkey; + + TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_a(name), data, count ? *count : 0 ); + + if (name && name[0]) + { + if ((ret = RegOpenKeyA( hkey, name, &subkey )) != ERROR_SUCCESS) return ret; + } + ret = RegQueryValueExA( subkey, NULL, NULL, NULL, (LPBYTE)data, (LPDWORD)count ); + if (subkey != hkey) RegCloseKey( subkey ); + if (ret == ERROR_FILE_NOT_FOUND) + { + /* return empty string if default value not found */ + if (data) *data = 0; + if (count) *count = 1; + ret = ERROR_SUCCESS; + } + return ret; } @@ -4257,75 +4176,42 @@ * * @implemented */ -LONG WINAPI -RegQueryValueW(HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpValue, - PLONG lpcbValue) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING SubKeyString; - HANDLE KeyHandle; - HANDLE RealKey; - LONG ErrorCode; - BOOL CloseRealKey; - NTSTATUS Status; - - TRACE("hKey 0x%X lpSubKey %S lpValue %p lpcbValue %d\n", - hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); - if (hKey == NULL) +LSTATUS WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count ) +{ + DWORD ret; + HKEY subkey = hkey; + + TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_w(name), data, count ? *count : 0 ); + if (hkey == NULL) { return ERROR_INVALID_HANDLE; } - Status = MapDefaultKey(&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - if (lpSubKey != NULL && - wcslen(lpSubKey) != 0) - { - RtlInitUnicodeString(&SubKeyString, - (LPWSTR)lpSubKey); - InitializeObjectAttributes(&ObjectAttributes, - &SubKeyString, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - Status = NtOpenKey(&RealKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - CloseRealKey = TRUE; - } - else - { - RealKey = hKey; - CloseRealKey = FALSE; - } - - ErrorCode = RegQueryValueExW(RealKey, - NULL, - NULL, - NULL, - (LPBYTE)lpValue, - (LPDWORD)lpcbValue); - if (CloseRealKey) - { - NtClose(RealKey); - } - -Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; + if (name && name[0]) + { + ret = RegOpenKeyW( hkey, name, &subkey); + if (ret != ERROR_SUCCESS) + { + return ret; + } + } + + ret = RegQueryValueExW( subkey, NULL, NULL, NULL, (LPBYTE)data, (LPDWORD)count ); + + if (subkey != hkey) + { + RegCloseKey( subkey ); + } + + if (ret == ERROR_FILE_NOT_FOUND) + { + /* return empty string if default value not found */ + if (data) + *data = 0; + if (count) + *count = sizeof(WCHAR); + ret = ERROR_SUCCESS; + } + return ret; } @@ -4806,86 +4692,43 @@ * * @implemented */ -LONG WINAPI -RegSetValueExA(HKEY hKey, - LPCSTR lpValueName, - DWORD Reserved, - DWORD dwType, - CONST BYTE* lpData, - DWORD cbData) -{ - UNICODE_STRING ValueName; - LPWSTR pValueName; - ANSI_STRING AnsiString; - UNICODE_STRING Data; - LONG ErrorCode; - LPBYTE pData; - DWORD DataSize; - - if (lpValueName != NULL && - strlen(lpValueName) != 0) - { - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (PSTR)lpValueName); - } - else - { - ValueName.Buffer = NULL; - } - - pValueName = (LPWSTR)ValueName.Buffer; - - if (((dwType == REG_SZ) || - (dwType == REG_MULTI_SZ) || - (dwType == REG_EXPAND_SZ)) && - (cbData != 0)) - { - /* NT adds one if the caller forgot the NULL-termination character */ - if (lpData[cbData - 1] != '\0') - { - cbData++; - } - - RtlInitAnsiString(&AnsiString, - NULL); - AnsiString.Buffer = (PSTR)lpData; - AnsiString.Length = cbData - 1; - AnsiString.MaximumLength = cbData; - RtlAnsiStringToUnicodeString(&Data, - &AnsiString, - TRUE); - pData = (LPBYTE)Data.Buffer; - DataSize = cbData * sizeof(WCHAR); - } - else - { - RtlInitUnicodeString(&Data, - NULL); - pData = (LPBYTE)lpData; - DataSize = cbData; - } - - ErrorCode = RegSetValueExW(hKey, - pValueName, - Reserved, - dwType, - pData, - DataSize); - if (pValueName != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - ValueName.Buffer); - } - - if (Data.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - Data.Buffer); - } - - return ErrorCode; +LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, + CONST BYTE *data, DWORD count ) +{ + ANSI_STRING nameA; + WCHAR *dataW = NULL; + NTSTATUS status; + + if (count && is_string(type)) + { + /* if user forgot to count terminating null, add it (yes NT does this) */ + if (data[count-1] && !data[count]) count++; + } + + status = MapDefaultKey( (PHANDLE)&hkey, hkey); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + if (is_string( type )) /* need to convert to Unicode */ + { + DWORD lenW; + RtlMultiByteToUnicodeSize( &lenW, (const char *)data, count ); + if (!(dataW = HeapAlloc( GetProcessHeap(), 0, lenW ))) return ERROR_OUTOFMEMORY; + RtlMultiByteToUnicodeN( dataW, lenW, NULL, (const char *)data, count ); + count = lenW; + data = (BYTE *)dataW; + } + + RtlInitAnsiString( &nameA, name ); + if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, + &nameA, FALSE ))) + { + status = NtSetValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, 0, type, (PVOID)data, count ); + } + HeapFree( GetProcessHeap(), 0, dataW ); + return RtlNtStatusToDosError( status ); }

3 4

Re: [ros-dev] [ros-diffs] [cgutman] 41090: - MajorFunction has IRP_MJ_MAXIMUM_FUNCTION positions - Sorry for so many commits on the same function
by Alex Ionescu 24 May '09

24 May '09

May I ask, why not use simple C for this?: DriverBlock->DriverObject->MajorFunction = MajorFunctions; Or if that doesn't work, use a casting trick... Best regards, Alex Ionescu On Sun, May 24, 2009 at 2:49 AM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Sun May 24 04:49:02 2009 > New Revision: 41090 > > URL: http://svn.reactos.org/svn/reactos?rev=41090&view=rev > Log: > - MajorFunction has IRP_MJ_MAXIMUM_FUNCTION positions > - Sorry for so many commits on the same function > > Modified: > trunk/reactos/drivers/network/ndis/ndis/miniport.c > > Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… > ============================================================================== > --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun May 24 04:49:02 2009 > @@ -2788,7 +2788,7 @@ > return NDIS_STATUS_RESOURCES; > } > > - for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) > + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; > > DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; > >

2 1

Re: [ros-dev] [ros-diffs] [cwittich] 41096: fix secur32 main winetest crash by returning 0 packages in EmumSecurityPackagesA/W
by Timo Kreuzer 24 May '09

24 May '09

What is the reason we don't sync wine's secur32? Thanks, Timo cwittich(a)svn.reactos.org schrieb: > Author: cwittich > Date: Sun May 24 13:40:15 2009 > New Revision: 41096 > > URL: http://svn.reactos.org/svn/reactos?rev=41096&view=rev > Log: > fix secur32 main winetest crash by returning 0 packages in EmumSecurityPackagesA/W > > Modified: > trunk/reactos/dll/win32/secur32/sspi.c > >

1 0

I have left ReactOS
by Andrew Greenwood 23 May '09

23 May '09

Hi, This mail is a little bit late as I didn't find time to write it earlier. Basically, I've decided that I do not want to continue working on ReactOS. I just don't find it "fun" or interesting to do any more. I spent months trying to get my head around Kernel Streaming and its associated components, how they fit together let alone how they actually function. And really, it's not enjoyable. I don't fully understand Windows kernel-mode coding, and coding the sound system really isn't as straightforward a task as I had originally anticipated. It has become more of a chore over time. Considering I made the switch from Windows to Linux around 2005 and have rarely actually needed to use Windows at home since then, there doesn't seem to be any benefit for me to put my time into working on ReactOS. Also I never really seemed to get very far with sound... I see Janderwald has taken up the challenge on this and is making good progress on it. I had been considering leaving a few months ago, but stuck around for our gathering in Brussels, which was great (aside from the restaurant which seemed like it was going to cook its customers, and the overly-smiley waiter who didn't fully explain what "special sauce" contained...) To be honest I think putting the hybrid CD together for that to be my best and also most hacky achievement for ReactOS. Starflow produced all the fliers/badges/etc. and I think altogether, FOSDEM was a success. And I hope it sparked interest for other people to join the project. I intend on working on some of my own projects from this point on (possibly audio related still...) All the best for the future, Andrew Greenwood

7 7

[ros-diffs] [dchapyshev] 41068: - Sync comctl32 with Wine 1.1.22 (without listview.c. Somebody help to sync listview! Now after sync listview there is a bug: http://opendn.org/listview.png)
by James Tabor 23 May '09

23 May '09

Hi all! What is missing with this? Do we need to fix User32? Did we not sync user32 controls? Edit, Combo, etc...? Thanks, James

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 41046: #if out an unused static funtion. Don't know if it's still useful. Ged?
by Ged 23 May '09

23 May '09

I have the code to complete this functionality locally, I just haven't committed it yet as it's not tested. Thanks for the conflict :-P -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of tkreuzer(a)svn.reactos.org Sent: 22 May 2009 23:18 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [tkreuzer] 41046: #if out an unused static funtion. Don't know if it's still useful. Ged? Author: tkreuzer Date: Sat May 23 02:17:55 2009 New Revision: 41046 URL: http://svn.reactos.org/svn/reactos?rev=41046&view=rev Log: #if out an unused static funtion. Don't know if it's still useful. Ged? Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Sat May 23 02:17:55 2009 @@ -50,6 +50,7 @@ return TreeView_InsertItem(hTreeView, &tvins); } +#if 0 // FIXME: What is this good for? static VOID AddServiceDependency(PSERVICEPROPSHEET dlgInfo, HWND hTreeView, @@ -123,6 +124,7 @@ } } +#endif static VOID AddServiceDependent(HWND hTreeView,

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 41042: - Formatting fix. No code change
by Aleksey Bragin 23 May '09

23 May '09

I hope you asked James and Timo, who may have uncommitted patches to this file (which would fail to apply now). WBR, Aleksey Bragin. On May 22, 2009, at 4:50 PM, dchapyshev(a)svn.reactos.org wrote: > Author: dchapyshev > Date: Fri May 22 16:50:31 2009 > New Revision: 41042 > > URL: http://svn.reactos.org/svn/reactos?rev=41042&view=rev > Log: > - Formatting fix. No code change > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/hook.c >

3 2

Network source code
by Timo Kreuzer 22 May '09

22 May '09

2 1

Re: [ros-dev] [ros-diffs] [sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up Reac
by Steven Edwards 20 May '09

20 May '09

On Thu, May 14, 2009 at 2:52 PM, KJK::Hyperion <hackbunny(a)reactos.org> wrote: > Ged wrote: >> Another unix like addition? >> Do we really need this and the previous telnet server in our source? > > to be fair, Windows does provide a command line TFTP client/server. So > far, I've only seen it used for malware spreading, but it's there and we > should provide one too Where I work we use dhcpd/tftp and PXEboot on both Linux and Windows to do automagical deployment services. The end goal with all of this is a ReactOS deployment system from a single image that can provision ReactOS thinkclients/diskless workstations without the need of a Linux or Windows host. Pushing out a freeldr or grub+freeldr or even pxelinux+grub+freeldr image with a blob containing a ROS ramdisk should be pretty simple using isc-dhcpd/tftp on Linux but I'm more interested in the infrastructure side of things right now. Currently the dhcpd with PXE support is the only part we are really missing. We COULD do it from Linux or Windows right now, but I want to get all the infrastructure in place where we don't need any other OS. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

10 16

Re: [ros-dev] runtime time function question in freeldr
by Zhang Fan 20 May '09

20 May '09

Thank you for your answer. But I'm still perplexd. pushl %eax //at that time ,%eax=0? so BootMain will receive NULL parameter? call _BootMain --- On Wed, 5/20/09, pay7n(a)o2.pl <pay7n(a)o2.pl> wrote: > From: pay7n(a)o2.pl <pay7n(a)o2.pl> > Subject: Re: [ros-dev] runtime time function question in freeldr > To: "ReactOS Development List" <ros-dev(a)reactos.org> > Date: Wednesday, May 20, 2009, 3:18 AM > This is not an Intel syntax. > Operands in memory operations have inverted order: > > mov src, dest > > not > > mov dest, src > > thus eax == 0 > > > Zhang Fan pisze: > > Hi everybody, > > I'm a newbie of ReactOS, and I've just looked a piece > of code in freeldr module. I found some runtime function > such as strstr(). I want to know if the run time lib should > be initialized, and where the initialized code. > > Another question is that a piece of code in arch.S > > > > > > EXTERN(RealEntryPoint) > > > > //.... > > .code32 > > > > /* Zero BootDrive and BootPartition > */ > > xorl %eax,%eax > > movl > %eax,(_BootDrive) > > movl > %eax,(_BootPartition) > > > > /* Store the boot drive */ > > movb > %dl,(_BootDrive) > > > > /* Store the boot partition */ > > movb > %dh,(_BootPartition) > > > > /* GO! */ > > pushl %eax > > call _BootMain > > > > At there, I think %eax should equal zero, and BootMain > will call CmdLineParse(),and CmdLineParse will call > strstr(). So it cause strstr will receive a NULL parameter. > Is it right? > > > > Thank you. > > > > Fan Zhang > > > > > > > > > > _______________________________________________ > > Ros-dev mailing list > > Ros-dev(a)reactos.org > > http://www.reactos.org/mailman/listinfo/ros-dev > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

1 0

runtime time function question in freeldr
by Zhang Fan 19 May '09

19 May '09

Hi everybody, I'm a newbie of ReactOS, and I've just looked a piece of code in freeldr module. I found some runtime function such as strstr(). I want to know if the run time lib should be initialized, and where the initialized code. Another question is that a piece of code in arch.S EXTERN(RealEntryPoint) //.... .code32 /* Zero BootDrive and BootPartition */ xorl %eax,%eax movl %eax,(_BootDrive) movl %eax,(_BootPartition) /* Store the boot drive */ movb %dl,(_BootDrive) /* Store the boot partition */ movb %dh,(_BootPartition) /* GO! */ pushl %eax call _BootMain At there, I think %eax should equal zero, and BootMain will call CmdLineParse(),and CmdLineParse will call strstr(). So it cause strstr will receive a NULL parameter. Is it right? Thank you. Fan Zhang

2 1

Re: [ros-dev] [ros-diffs] [tkreuzer] 40963: MmGrowKernelStack: Don't assert, but fail, when the kernel stack can't grow any more. Fixes a crash with recursive user calls. See issue #4060 for more details.
by Alex Ionescu 19 May '09

19 May '09

The code SHOULD assert. This is a hack. Best regards, Alex Ionescu On Sun, May 17, 2009 at 11:51 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon May 18 01:51:31 2009 > New Revision: 40963 > > URL: http://svn.reactos.org/svn/reactos?rev=40963&view=rev > Log: > MmGrowKernelStack: Don't assert, but fail, when the kernel stack can't grow > any more. Fixes a crash with recursive user calls. > See issue #4060 for more details. > > Modified: > trunk/reactos/ntoskrnl/mm/procsup.c > > Modified: trunk/reactos/ntoskrnl/mm/procsup.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon May 18 01:51:31 > 2009 > @@ -259,8 +259,11 @@ > PETHREAD Thread = PsGetCurrentThread(); > > /* Make sure we have reserved space for our grow */ > - ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > <= > - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); > + if (((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > > + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)) > + { > + return STATUS_NO_MEMORY; > + } > > /* > * We'll give you three more pages. > >

5 6

Re: [ros-dev] [ros-diffs] [janderwald] 40967: - Play default logon sound when logging on - Due to unknown issues, this only works at the 2nd login ATM
by Ged 18 May '09

18 May '09

This shouldn't be in here. I can't tell you where it should be as I've never looked, but it's not userinit's responsibility to play logon music. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of janderwald(a)svn.reactos.org Sent: 18 May 2009 16:41 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [janderwald] 40967: - Play default logon sound when logging on - Due to unknown issues, this only works at the 2nd login ATM Author: janderwald Date: Mon May 18 19:41:00 2009 New Revision: 40967 URL: http://svn.reactos.org/svn/reactos?rev=40967&view=rev Log: - Play default logon sound when logging on - Due to unknown issues, this only works at the 2nd login ATM Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon May 18 19:41:00 2009 @@ -591,6 +591,51 @@ WARN("RegOpenKeyEx() failed with error %lu\n", rc); } +static VOID +PlayLogonSound() +{ + HKEY hKey; + WCHAR szBuffer[MAX_PATH] = {0}; + WCHAR szDest[MAX_PATH]; + DWORD dwSize = sizeof(szBuffer); + HMODULE hLibrary; + typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + PLAYSOUNDW Play; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + return; + } + + if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szBuffer, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + + RegCloseKey(hKey); + + if (!szBuffer[0]) + return; + + + szBuffer[MAX_PATH-1] = L'\0'; + if (ExpandEnvironmentStringsW(szBuffer, szDest, MAX_PATH)) + { + hLibrary = LoadLibraryW(L"winmm.dll"); + if (hLibrary) + { + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + if (Play) + { + Play(szDest, NULL, SND_FILENAME); + } + FreeLibrary(hLibrary); + } + } +} + static VOID SetUserSettings(VOID) { @@ -640,6 +685,7 @@ SetUserSettings(); StartShell(); NotifyLogon(); + PlayLogonSound(); return 0; }

1 0

I want to develop the kernel of ReactOS, how do i join????
by Joshua Bailey 18 May '09

18 May '09

Hello mailing list folks! While Xiaoming wouldn't be able to have commit access, would he be able to contribute in other ways not related to coding, i.e., hardware or software testing? Just curious. Mr. Ionescu, I probably would have tried to tell Xiaoming what I know about the rules, too, even though I'm not a developer. Actually, the FAQ is pretty clear in regards to ReactOS only using clean-room reverse engineering. http://www.reactos.org/en/about_userfaq.html. I would have just referred him to this, if you or another developer hadn't jumped in to give a more precise answer. I usually leave it up to the devs to answer questions, but I try to answer questions if I can when no developer is at hand at the moment. I hope that doesn't mean I have a drug problem. :) To be honest, I was pretty confused myself about who could do what if they had seen Windows source code beforehand. I know the current position is that seeing source code != no ReactOS programming for you, but then again there was the whole debate a few years back about whether the devs at the top had seen any Windows source code and I'm still not sure how that got resolved. I had alternately heard that people who had seen source code couldn't contribute, or if they had they could only code stuff whose Windows equivalents they hadn't seen the source code to, so it's not something that was just made up. I'm not trying to restart old flame wars, but the fact is that the policy regarding Windows source code hasn't always been so clear, which may have left some people (myself included) confused. While I personally wouldn't have replied assuming the same level of authority as a developer, I don't think us ordinary folks should be blamed if we've gotten a little confused about this througout the course of the past few years. I don't mean to start off here on a bad note, but I get irritated because on the forums someone asks a simple question, someone answers, the devs get angry because they feel someone overstepped their authority, even thought the devs tend to give a terse answer with no explanation. The newbie scared of asking anything else about the project because folks get so angry with one another, and figures it's not worth the trouble of getting involved. By the way, if the formatting here looks like it was written by a crackhead, it's because this is my first time posting on the mailing list. (I'm more active on the forums.) Then again, my hometown inspired The Wire, so who knows. :P -Joshua Bailey

3 2

Re: [ros-dev] [ros-diffs] [fireball] 40961: - Initialize IoCountOperations variable to FALSE by default. Spotted by Dmitry Chapyshev & winetests.
by Alex Ionescu 18 May '09

18 May '09

Um, there's a serious compiler/linker/loader bug if that value is not already FALSE by default. Best regards, Alex Ionescu On Sun, May 17, 2009 at 6:46 PM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Sun May 17 20:46:58 2009 > New Revision: 40961 > > URL: http://svn.reactos.org/svn/reactos?rev=40961&view=rev > Log: > - Initialize IoCountOperations variable to FALSE by default. Spotted by > Dmitry Chapyshev & winetests. > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… > > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun May 17 > 20:46:58 2009 > @@ -31,7 +31,7 @@ > POBJECT_TYPE IoFileObjectType = NULL; > extern POBJECT_TYPE IoControllerObjectType; > extern UNICODE_STRING NtSystemRoot; > -BOOLEAN IoCountOperations; > +BOOLEAN IoCountOperations = FALSE; > ULONG IoReadOperationCount = 0; > LARGE_INTEGER IoReadTransferCount = {{0, 0}}; > ULONG IoWriteOperationCount = 0; > >

2 1

I want to develop the kernel of ReactOS, how do i join????
by Xiaoming Gao 18 May '09

18 May '09

Hi guys: I have read the linux kernel code and part of the leaked winnt source code,and i want to join the developing of ReactOS kernel,how can i join??

16 28

Firefox 3 too slow, i think due to log flooding
by Javier Agustìn Fernàndez Arroyo 16 May '09

16 May '09

hi devs, testing FF3 i have noticed that this app has been slowed down a lot And there is a high difference between running it with kdbg enabled, and running without it Also, log is flooded with the following lines: (subsystems/win32/win32k/objects/gdiobj.c:814) Attempted to lock object 0x0 of wrong type (Handle: 0x0, requested: 0x40000) (subsystems/win32/win32k/objects/gdiobj.c:814) Attempted to lock object 0x0 of wrong type (Handle: 0x0, requested: 0x40000) (subsystems/win32/win32k/objects/region.c:2250) NtGdiCombineRgn requires hSrc2 != NULL for combine mode 1!

2 1

Re: [ros-dev] [ros-diffs] [sedwards] 40919: imported the MTsnapshot of the GPL tftp-server for win32 from sourceforge.Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up Reac
by Merlyn Rees 15 May '09

15 May '09

Surely some things really could be split off into separate projects if people felt the urge without causing any real problems. This very ftp server, for instance, or a replacement shell (as in a new explorer.exe). The kind of projects that require more common application developer skills, rather than reproducing Windows internals. ...alright, so the appropriate shell hooks aren't in place at the moment. Bad example. Hopefully you kind of get what I'm referring to though. On May 15, 2009 7:41 PM, "Imre Leber" <imre.leber(a)telenet.be> wrote: Well that is exactly the reason why linux is broken. Completely useless unless you pay someone to make a distro. Please make that kind of crap a thing of the past! Imre > > > On Fri, May 15, 2009 at 3:03 AM, Peter Millerchip < peter.millerchip(a)gmail.com> wrote: >> >> H... ------------------------------ > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > ... _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

2 1

Re: [ros-dev] [ros-diffs] [sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to P
by Ged 14 May '09

14 May '09

Another unix like addition? Do we really need this and the previous telnet server in our source? We're always discussing ways to get the build time down but constantly adding more and more extras. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of sedwards(a)svn.reactos.org Sent: 14 May 2009 15:52 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE b Author: sedwards Date: Thu May 14 18:52:22 2009 New Revision: 40919 URL: http://svn.reactos.org/svn/reactos?rev=40919&view=rev Log: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE boot Added: trunk/reactos/base/services/tftpd/ trunk/reactos/base/services/tftpd/README.txt (with props) trunk/reactos/base/services/tftpd/tftpd.cpp (with props) trunk/reactos/base/services/tftpd/tftpd.h (with props) trunk/reactos/base/services/tftpd/tftpd.rbuild (with props) Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -25,6 +25,9 @@ <directory name="telnetd"> <xi:include href="telnetd/telnetd.rbuild" /> </directory> + <directory name="tftpd"> + <xi:include href="tftpd/tftpd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Added: trunk/reactos/base/services/tftpd/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/README… ============================================================================== --- trunk/reactos/base/services/tftpd/README.txt (added) +++ trunk/reactos/base/services/tftpd/README.txt [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,3 @@ +This is a snapshot from the 1.6 release of tftp-server for win32 from sourceforge. + +http://tftp-server.sourceforge.net Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp (added) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,2245 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* 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., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#include <stdio.h> +#include <winsock2.h> +#include <process.h> +#include <time.h> +#include <tchar.h> +#include <ws2tcpip.h> +#include <limits.h> +#include <iphlpapi.h> +#include "tftpd.h" + +//Global Variables +char serviceName[] = "TFTPServer"; +char displayName[] = "TFTP Server Multithreaded"; +char sVersion[] = "TFTP Server MultiThreaded Version 1.61 Windows Built 1611"; +char iniFile[_MAX_PATH]; +char logFile[_MAX_PATH]; +char tempbuff[256]; +char logBuff[512]; +char fileSep = '\\'; +char notFileSep = '/'; +WORD blksize = 65464; +char verbatim = 0; +WORD timeout = 3; +data2 cfig; +//ThreadPool Variables +HANDLE tEvent; +HANDLE cEvent; +HANDLE sEvent; +HANDLE lEvent; +BYTE currentServer = UCHAR_MAX; +WORD totalThreads=0; +WORD minThreads=1; +WORD activeThreads=0; + +//Service Variables +SERVICE_STATUS serviceStatus; +SERVICE_STATUS_HANDLE serviceStatusHandle = 0; +HANDLE stopServiceEvent = 0; + +void WINAPI ServiceControlHandler(DWORD controlCode) +{ + switch (controlCode) + { + case SERVICE_CONTROL_INTERROGATE: + break; + + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + SetEvent(stopServiceEvent); + return ; + + case SERVICE_CONTROL_PAUSE: + break; + + case SERVICE_CONTROL_CONTINUE: + break; + + default: + if (controlCode >= 128 && controlCode <= 255) + break; + else + break; + } + + SetServiceStatus(serviceStatusHandle, &serviceStatus); +} + +void WINAPI ServiceMain(DWORD /*argc*/, TCHAR* /*argv*/[]) +{ + serviceStatus.dwServiceType = SERVICE_WIN32; + serviceStatus.dwCurrentState = SERVICE_STOPPED; + serviceStatus.dwControlsAccepted = 0; + serviceStatus.dwWin32ExitCode = NO_ERROR; + serviceStatus.dwServiceSpecificExitCode = NO_ERROR; + serviceStatus.dwCheckPoint = 0; + serviceStatus.dwWaitHint = 0; + + serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); + + if (serviceStatusHandle) + { + serviceStatus.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + //init + verbatim = false; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + stopServiceEvent = CreateEvent(0, FALSE, FALSE, 0); + + serviceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + do + { + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + int fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + + } + + SetEvent(tEvent); + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (WaitForSingleObject(stopServiceEvent, 0) == WAIT_TIMEOUT); + + if (cfig.logfile) + fclose(cfig.logfile); + + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + sprintf(logBuff, "Closing Network Connections..."); + logMess(logBuff, 1); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); + + sprintf(logBuff, "TFTP Server Stopped !"); + logMess(logBuff, 1); + + serviceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_STOPPED; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + CloseHandle(stopServiceEvent); + stopServiceEvent = 0; + } +} + +void runService() +{ + SERVICE_TABLE_ENTRY serviceTable[] = + { + {serviceName, ServiceMain}, + {0, 0} + }; + + StartServiceCtrlDispatcher(serviceTable); +} + +bool stopService(SC_HANDLE service) +{ + if (service) + { + SERVICE_STATUS serviceStatus; + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState != SERVICE_STOPPED) + { + ControlService(service, SERVICE_CONTROL_STOP, &serviceStatus); + printf("Stopping Service."); + for (int i = 0; i < 100; i++) + { + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState == SERVICE_STOPPED) + { + printf("Stopped\n"); + return true; + } + else + { + Sleep(500); + printf("."); + } + } + printf("Failed\n"); + return false; + } + } + return true; +} + +void installService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS); + if (service) + { + printf("Service Already Exists..\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + { + TCHAR path[ _MAX_PATH + 1 ]; + if (GetModuleFileName(0, path, sizeof(path) / sizeof(path[0])) > 0) + { + SC_HANDLE service = CreateService(serviceControlManager, + serviceName, displayName, + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path, + 0, 0, 0, 0, 0); + if (service) + { + printf("Successfully installed.. !\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + printf("Installation Failed..\n"); + } + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void uninstallService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP | DELETE); + if (service) + { + if (stopService(service)) + { + DeleteService(service); + printf("Successfully Removed !\n"); + } + else + printf("Failed to Stop Service..\n"); + + CloseServiceHandle(service); + } + + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void printWindowsError() +{ + DWORD dw = GetLastError(); + + if (dw) + { + LPVOID lpMsgBuf; + LPVOID lpDisplayBuf; + + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dw, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, + 0, NULL ); + + printf("Error: %s\nPress Enter..\n", lpMsgBuf); + getchar(); + } +} + +int main(int argc, TCHAR* argv[]) +{ + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(osvi); + bool result = GetVersionEx(&osvi); + + if (result && osvi.dwPlatformId >= VER_PLATFORM_WIN32_NT) + { + if (argc > 1 && lstrcmpi(argv[1], TEXT("-i")) == 0) + installService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-u")) == 0) + uninstallService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-v")) == 0) + { + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + bool serviceStopped = true; + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP); + if (service) + { + serviceStopped = stopService(service); + CloseServiceHandle(service); + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); + + if (serviceStopped) + runProg(); + else + printf("Failed to Stop Service\n"); + } + else + runService(); + } + else if (argc == 1 || lstrcmpi(argv[1], TEXT("-v")) == 0) + runProg(); + else + printf("This option is not available on Windows95/98/ME\n"); + + return 0; +} + +void runProg() +{ + verbatim = true; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + printf("\naccepting requests..\n"); + + do + { + //printf("Active=%u Total=%u\n",activeThreads, totalThreads); + + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + //if (errno) + // printf("%s\n", strerror(errno)); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + //printf("Request Waiting\n"); + + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + SetEvent(tEvent); + + //printf("thread signalled=%u\n",SetEvent(tEvent)); + + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (true); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); +} + +void processRequest(void *lpParam) +{ + //printf("New Thread %u\n",GetCurrentThreadId()); + + request req; + + WaitForSingleObject(cEvent, INFINITE); + totalThreads++; + SetEvent(cEvent); + + do + { + WaitForSingleObject(tEvent, INFINITE); + //printf("In Thread %u\n",GetCurrentThreadId()); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads++; + SetEvent(cEvent); + + if (currentServer >= MAX_SERVERS || !cfig.tftpConn[currentServer].port) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + memset(&req, 0, sizeof(request)); + req.sock = INVALID_SOCKET; + + req.clientsize = sizeof(req.client); + req.sockInd = currentServer; + currentServer = UCHAR_MAX; + req.knock = cfig.tftpConn[req.sockInd].sock; + + if (req.knock == INVALID_SOCKET) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.bytesRecd = recvfrom(req.knock, (char*)&req.mesin, sizeof(message), 0, (sockaddr*)&req.client, &req.clientsize); + errno = WSAGetLastError(); + + //printf("socket Signalled=%u\n",SetEvent(sEvent)); + SetEvent(sEvent); + + if (!errno && req.bytesRecd > 0) + { + if (cfig.hostRanges[0].rangeStart) + { + DWORD iip = ntohl(req.client.sin_addr.s_addr); + bool allowed = false; + + for (int j = 0; j <= 32 && cfig.hostRanges[j].rangeStart; j++) + { + if (iip >= cfig.hostRanges[j].rangeStart && iip <= cfig.hostRanges[j].rangeEnd) + { + allowed = true; + break; + } + } + + if (!allowed) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access Denied"); + logMess(&req, 1); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + + if ((htons(req.mesin.opcode) == 5)) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + continue; + } + else if (htons(req.mesin.opcode) != 1 && htons(req.mesin.opcode) != 2) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(5); + sprintf(req.serverError.errormessage, "Unknown Transfer Id"); + logMess(&req, 2); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + else + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.blksize = 512; + req.timeout = timeout; + req.expiry = time(NULL) + req.timeout; + bool fetchAck = false; + + req.sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if (req.sock == INVALID_SOCKET) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Thread Socket Creation Error"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + sockaddr_in service; + service.sin_family = AF_INET; + service.sin_addr.s_addr = cfig.tftpConn[req.sockInd].server; + + if (cfig.minport) + { + for (WORD comport = cfig.minport; ; comport++) + { + service.sin_port = htons(comport); + + if (comport > cfig.maxport) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "No port is free"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + continue; + else + break; + } + } + else + { + service.sin_port = 0; + + if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + { + strcpy(req.serverError.errormessage, "Thread failed to bind"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + } + } + + if (req.attempt >= 3) + continue; + + if (connect(req.sock, (sockaddr*)&req.client, req.clientsize) == -1) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Connect Failed"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + //sprintf(req.serverError.errormessage, "In Temp, Socket"); + //logMess(&req, 1); + + char *inPtr = req.mesin.buffer; + *(inPtr + (req.bytesRecd - 3)) = 0; + req.filename = inPtr; + + if (!strlen(req.filename) || strlen(req.filename) > UCHAR_MAX) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Filename"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + req.mode = inPtr; + + if (!strlen(req.mode) || strlen(req.mode) > 25) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Mode"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + + for (DWORD i = 0; i < strlen(req.filename); i++) + if (req.filename[i] == notFileSep) + req.filename[i] = fileSep; + + tempbuff[0] = '.'; + tempbuff[1] = '.'; + tempbuff[2] = fileSep; + tempbuff[3] = 0; + + if (strstr(req.filename, tempbuff)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access violation"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.filename[0] == fileSep) + req.filename++; + + if (!cfig.homes[0].alias[0]) + { + if (strlen(cfig.homes[0].target) + strlen(req.filename) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + strcpy(req.path, cfig.homes[0].target); + strcat(req.path, req.filename); + } + else + { + char *bname = strchr(req.filename, fileSep); + + if (bname) + { + *bname = 0; + bname++; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "Missing directory/alias"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + for (int i = 0; i < 8; i++) + { + //printf("%s=%i\n", req.filename, cfig.homes[i].alias[0]); + if (cfig.homes[i].alias[0] && !strcasecmp(req.filename, cfig.homes[i].alias)) + { + if (strlen(cfig.homes[i].target) + strlen(bname) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + strcpy(req.path, cfig.homes[i].target); + strcat(req.path, bname); + break; + } + else if (i == 7 || !cfig.homes[i].alias[0]) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "No such directory/alias %s", req.filename); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + + if (req.attempt >= 3) + continue; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!cfig.fileRead) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "GET Access Denied"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + if (*inPtr) + { + char *tmp = inPtr; + + while (*tmp) + { + if (!strcasecmp(tmp, "blksize")) + { + tmp += strlen(tmp) + 1; + DWORD val = atol(tmp); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + break; + } + + tmp += strlen(tmp) + 1; + } + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "rt"); + else + req.file = fopen(req.path, "rb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(1); + strcpy(req.serverError.errormessage, "File not found or No Access"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + setvbuf(req.file, NULL, _IOFBF, req.blksize); + } + else + { + if (!cfig.fileWrite && !cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "PUT Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.file = fopen(req.path, "rb"); + + if (req.file) + { + fclose(req.file); + req.file = NULL; + + if (!cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(6); + strcpy(req.serverError.errormessage, "File already exists"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (!cfig.fileWrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Create File Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "wt"); + else + req.file = fopen(req.path, "wb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + + if (*inPtr) + { + fetchAck = true; + char *outPtr = req.mesout.buffer; + req.mesout.opcode = htons(6); + DWORD val; + while (*inPtr) + { + //printf("%s\n", inPtr); + if (!strcasecmp(inPtr, "blksize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atol(inPtr); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + else if (!strcasecmp(inPtr, "tsize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!fseek(req.file, 0, SEEK_END)) + { + if (ftell(req.file) >= 0) + { + req.tsize = ftell(req.file); + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.tsize = 0; + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + } + else if (!strcasecmp(inPtr, "timeout")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atoi(inPtr); + + if (val < 1) + val = 1; + else if (val > UCHAR_MAX) + val = UCHAR_MAX; + + req.timeout = val; + req.expiry = time(NULL) + req.timeout; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + + inPtr += strlen(inPtr) + 1; + //printf("=%u\n", val); + } + + if (req.attempt >= 3) + continue; + + errno = 0; + req.bytesReady = (DWORD)outPtr - (DWORD)&req.mesout; + //printf("Bytes Ready=%u\n", req.bytesReady); + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + else if (htons(req.mesin.opcode) == 2) + { + req.acout.opcode = htons(4); + req.acout.block = htons(0); + errno = 0; + req.bytesReady = 4; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + else if (ntohs(req.mesin.opcode) == 1) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + req.pkt[1] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0] || !req.pkt[1]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + long ftellLoc = ftell(req.file); + + if (ftellLoc > 0) + { + if (fseek(req.file, 0, SEEK_SET)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (ftellLoc < 0) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.pkt[0]->opcode = htons(3); + req.pkt[0]->block = htons(1); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.bytesRead[0] == req.blksize) + { + req.pkt[1]->opcode = htons(3); + req.pkt[1]->block = htons(2); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + else + { + fclose(req.file); + req.file = 0; + } + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + if (fetchAck) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)&req.mesin, sizeof(message), 0); + errno = WSAGetLastError(); + if (req.bytesRecd <= 0 || errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if(req.bytesRecd >= 4 && ntohs(req.mesin.opcode) == 4) + { + if (ntohs(req.acin.block) == req.block) + { + req.block++; + req.fblock++; + req.attempt = 0; + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else if (ntohs(req.mesin.opcode) == 5) + { + sprintf(req.serverError.errormessage, "Client %s:%u, Error Code %i at Client, %s", inet_ntoa(req.client.sin_addr), ntohs(req.client.sin_port), ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.mesin.opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else + { + fetchAck = true; + req.acin.block = 1; + req.block = 1; + req.fblock = 1; + } + + if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else if (!req.fblock) + { + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + } + else if (ntohs(req.pkt[0]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[0], req.bytesRead[0] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[1]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[1]->block = htons(++req.tblock); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else if (ntohs(req.pkt[1]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[1], req.bytesRead[1] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[0]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[0]->block = htons(++req.tblock); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[0] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else + { + sprintf(req.serverError.errormessage, "%u Blocks Served", req.fblock - 1); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (ntohs(req.mesin.opcode) == 2) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)req.pkt[0], req.blksize + 4, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + req.bytesRecd = 0; + + if (req.bytesRecd >= 4) + { + if (ntohs(req.pkt[0]->opcode) == 3) + { + req.tblock = req.block + 1; + + if (ntohs(req.pkt[0]->block) == req.tblock) + { + req.acout.opcode = htons(4); + req.acout.block = req.pkt[0]->block; + req.block++; + req.fblock++; + req.bytesReady = 4; + req.expiry = time(NULL) + req.timeout; + + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + if (req.bytesRecd > 4) + { + errno = 0; + if (fwrite(&req.pkt[0]->buffer, req.bytesRecd - 4, 1, req.file) != 1 || errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(3); + strcpy(req.serverError.errormessage, "Disk full or allocation exceeded"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + req.attempt = 0; + } + else + req.attempt = 0; + + if ((WORD)req.bytesRecd < req.blksize + 4) + { + fclose(req.file); + req.file = 0; + sprintf(req.serverError.errormessage, "%u Blocks Received", req.fblock); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (req.bytesRecd > (int)sizeof(message)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Error: Incoming Packet too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (ntohs(req.pkt[0]->opcode) == 5) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.pkt[0]->block), &req.pkt[0]->buffer); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.pkt[0]->opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + } + } + while (cleanReq(&req)); + + WaitForSingleObject(cEvent, INFINITE); + totalThreads--; + SetEvent(cEvent); + + //printf("Thread %u Killed\n",GetCurrentThreadId()); + _endthread(); + return; +} + +bool cleanReq(request* req) +{ + //printf("cleaning\n"); + + if (req->file) + fclose(req->file); + + if (!(req->sock == INVALID_SOCKET)) + { + //printf("Here\n"); + closesocket(req->sock); + } + + if (req->pkt[0]) + free(req->pkt[0]); + + if (req->pkt[1]) + free(req->pkt[1]); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads--; + SetEvent(cEvent); + + //printf("cleaned\n"); + + return (totalThreads <= minThreads); +} + +char* myGetToken(char* buff, BYTE index) +{ + while (*buff) + { + if (index) + index--; + else + break; + + buff += strlen(buff) + 1; + } + + return buff; +} + +WORD myTokenize(char *target, char *source, char *sep, bool whiteSep) +{ + bool found = true; + char *dp = target; + WORD kount = 0; + + while (*source) + { + if (sep && sep[0] && strchr(sep, (*source))) + { + found = true; + source++; + continue; + } + else if (whiteSep && *source <= 32) + { + found = true; + source++; + continue; + } + + if (found) + { + if (target != dp) + { + *dp = 0; + dp++; + } + kount++; + } + + found = false; + *dp = *source; + dp++; + source++; + } + + *dp = 0; + dp++; + *dp = 0; + + //printf("%s\n", target); + + return kount; +} + +char* myTrim(char *target, char *source) +{ + while ((*source) && (*source) <= 32) + source++; + + int i = 0; + + for (; i < 511 && source[i]; i++) + target[i] = source[i]; + + target[i] = source[i]; + i--; + + for (; i >= 0 && target[i] <= 32; i--) + target[i] = 0; + + return target; +} + +void mySplit(char *name, char *value, char *source, char splitChar) +{ + int i = 0; + int j = 0; + int k = 0; + + for (; source[i] && j <= 510 && source[i] != splitChar; i++, j++) + { + name[j] = source[i]; + } + + if (source[i]) + { + i++; + for (; k <= 510 && source[i]; i++, k++) + { + value[k] = source[i]; + } + } + + name[j] = 0; + value[k] = 0; + + myTrim(name, name); + myTrim(value, value); + //printf("%s %s\n", name, value); +} + +bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName) +{ + //printf("%s=%s\n",fileName,sectionName); + char section[128]; + sprintf(section, "[%s]", sectionName); + myUpper(section); + FILE *f = fopen(fileName, "rt"); + char buff[512]; + BYTE found = 0; + + if (f) + { + while (fgets(buff, 511, f)) + { + myUpper(buff); + myTrim(buff, buff); + + if (strstr(buff, section) == buff) + { + found++; + if (found == serial) + { + //printf("%s=%s\n",fileName,sectionName); + while (fgets(buff, 511, f)) + { + myTrim(buff, buff); + + if (strstr(buff, "[") == buff) + break; + + if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff)))) + { + buffer += sprintf(buffer, "%s", buff); + buffer++; + } + } + break; + } + } + } + fclose(f); + } + + *buffer = 0; + *(buffer + 1) = 0; + return (found == serial); +} + +char *IP2String(char *target, DWORD ip) +{ + data15 inaddr; + inaddr.ip = ip; + sprintf(target, "%u.%u.%u.%u", inaddr.octate[0], inaddr.octate[1], inaddr.octate[2], inaddr.octate[3]); + return target; +} + +bool isIP(char *string) +{ + int j = 0; + + for (; *string; string++) + { + if (*string == '.' && *(string + 1) != '.') + j++; + else if (*string < '0' || *string > '9') + return 0; + } + + if (j == 3) + return 1; + else + return 0; +} + +char *myUpper(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'a' && string[i] <= 'z') + string[i] -= diff; + return string; +} + +char *myLower(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'A' && string[i] <= 'Z') + string[i] += diff; + return string; +} + +void init() +{ + memset(&cfig, 0, sizeof(cfig)); + + GetModuleFileName(NULL, iniFile, MAX_PATH); + char *iniFileExt = strrchr(iniFile, '.'); + strcpy(iniFileExt, ".ini"); + GetModuleFileName(NULL, logFile, MAX_PATH); + iniFileExt = strrchr(logFile, '.'); + strcpy(iniFileExt, ".log"); + + char iniStr[4096]; + char name[256]; + char value[256]; + + if (verbatim) + { + cfig.logLevel = 2; + printf("%s\n\n", sVersion); + } + else if (getSection("LOGGING", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + if (!iniStrPtr[0] || !strcasecmp(iniStrPtr, "None")) + cfig.logLevel = 0; + else if (!strcasecmp(iniStrPtr, "Errors")) + cfig.logLevel = 1; + else if (!strcasecmp(iniStrPtr, "All")) + cfig.logLevel = 2; + else if (!strcasecmp(iniStrPtr, "Debug")) + cfig.logLevel = 3; + else + cfig.logLevel = UCHAR_MAX; + } + + if (!verbatim && cfig.logLevel) + { + cfig.logfile = fopen(logFile, "wt"); + + if (cfig.logfile) + { + fclose(cfig.logfile); + cfig.logfile = fopen(logFile, "at"); + fprintf(cfig.logfile, "%s\n", sVersion); + } + } + + if (cfig.logLevel == UCHAR_MAX) + { + cfig.logLevel = 1; + sprintf(logBuff, "Section [LOGGING], Invalid Logging Level: %s, ignored", myGetToken(iniStr, 0)); + logMess(logBuff, 1); + } + + WORD wVersionRequested = MAKEWORD(1, 1); + WSAStartup(wVersionRequested, &cfig.wsaData); + + if (cfig.wsaData.wVersion != wVersionRequested) + { + sprintf(logBuff, "WSAStartup Error"); + logMess(logBuff, 1); + } + + if (getSection("LISTEN-ON", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + for (int i = 0; i < MAX_SERVERS && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + strncpy(name, iniStrPtr, UCHAR_MAX); + WORD port = 69; + char *dp = strchr(name, ':'); + if (dp) + { + *dp = 0; + dp++; + port = atoi(dp); + } + + DWORD ip = my_inet_addr(name); + + if (isIP(name) && ip) + { + for (BYTE j = 0; j < MAX_SERVERS; j++) + { + if (cfig.servers[j] == ip) + break; + else if (!cfig.servers[j]) + { + cfig.servers[j] = ip; + cfig.ports[j] = port; + i++; + break; + } + } + } + else + { + sprintf(logBuff, "Warning: Section [LISTEN-ON], Invalid IP Address %s, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (getSection("HOME", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (; iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!cfig.homes[0].alias[0] && cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (strchr(name, notFileSep) || strchr(name, fileSep) || strchr(name, '>') || strchr(name, '<') || strchr(name, '.')) + { + sprintf(logBuff, "Section [HOME], invalid chars in alias %s, entry ignored", name); + logMess(logBuff, 1); + } + else if (name[0] && strlen(name) < 64 && value[0]) + { + for (int i = 0; i < 8; i++) + { + if (cfig.homes[i].alias[0] && !strcasecmp(name, cfig.homes[i].alias)) + { + sprintf(logBuff, "Section [HOME], Duplicate Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + break; + } + else if (!cfig.homes[i].alias[0]) + { + strcpy(cfig.homes[i].alias, name); + strcpy(cfig.homes[i].target, value); + + if (cfig.homes[i].target[strlen(cfig.homes[i].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[i].target, tempbuff); + } + + break; + } + } + } + else + { + sprintf(logBuff, "Section [HOME], alias name too large", name); + logMess(logBuff, 1); + } + } + else if (!cfig.homes[0].alias[0] && !cfig.homes[0].target[0]) + { + strcpy(cfig.homes[0].target, name); + + if (cfig.homes[0].target[strlen(cfig.homes[0].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[0].target, tempbuff); + } + } + else if (cfig.homes[0].alias[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], Duplicate Path: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "Section [HOME], missing = sign, Invalid Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (!cfig.homes[0].target[0]) + { + GetModuleFileName(NULL, cfig.homes[0].target, UCHAR_MAX); + char *iniFileExt = strrchr(cfig.homes[0].target, fileSep); + *(++iniFileExt) = 0; + } + + cfig.fileRead = true; + + if (getSection("TFTP-OPTIONS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (;strlen(iniStrPtr);iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!strcasecmp(name, "blksize")) + { + DWORD tblksize = atol(value); + + if (tblksize < 512) + blksize = 512; + else if (tblksize > USHRT_MAX - 32) + blksize = USHRT_MAX - 32; + else + blksize = tblksize; + } + else if (!strcasecmp(name, "threadpoolsize")) + { + minThreads = atol(value); + if (minThreads < 1) + minThreads = 0; + else if (minThreads > 100) + minThreads = 100; + } + else if (!strcasecmp(name, "timeout")) + { + timeout = atol(value); + if (timeout < 1) + timeout = 1; + else if (timeout > UCHAR_MAX) + timeout = UCHAR_MAX; + } + else if (!strcasecmp(name, "Read")) + { + if (strchr("Yy", *value)) + cfig.fileRead = true; + else + cfig.fileRead = false; + } + else if (!strcasecmp(name, "Write")) + { + if (strchr("Yy", *value)) + cfig.fileWrite = true; + else + cfig.fileWrite = false; + } + else if (!strcasecmp(name, "Overwrite")) + { + if (strchr("Yy", *value)) + cfig.fileOverwrite = true; + else + cfig.fileOverwrite = false; + } + else if (!strcasecmp(name, "port-range")) + { + char *ptr = strchr(value, '-'); + if (ptr) + { + *ptr = 0; + cfig.minport = atol(value); + cfig.maxport = atol(++ptr); + + if (cfig.minport < 1024 || cfig.minport >= USHRT_MAX || cfig.maxport < 1024 || cfig.maxport >= USHRT_MAX || cfig.minport > cfig.maxport) + { + cfig.minport = 0; + cfig.maxport = 0; + + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Warning: unknown option %s, ignored", name); + logMess(logBuff, 1); + } + } + } + } + + if (getSection("ALLOWED-CLIENTS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (int i = 0; i < 32 && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + DWORD rs = 0; + DWORD re = 0; + mySplit(name, value, iniStrPtr, '-'); + rs = htonl(my_inet_addr(name)); + + if (strlen(value)) + re = htonl(my_inet_addr(value)); + else + re = rs; + + if (rs && rs != INADDR_NONE && re && re != INADDR_NONE && rs <= re) + { + cfig.hostRanges[i].rangeStart = rs; + cfig.hostRanges[i].rangeEnd = re; + i++; + } + else + { + sprintf(logBuff, "Section [ALLOWED-CLIENTS] Invalid entry %s in ini file, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + +// if (!cfig.servers[0]) +// getServ(); + + int i = 0; + + for (int j = 0; j < MAX_SERVERS; j++) + { + if (j && !cfig.servers[j]) + break; + + cfig.tftpConn[i].sock = socket(PF_INET, + SOCK_DGRAM, + IPPROTO_UDP); + + if (cfig.tftpConn[i].sock == INVALID_SOCKET) + { + sprintf(logBuff, "Failed to Create Socket"); + logMess(logBuff, 1); + continue; + } + + cfig.tftpConn[i].addr.sin_family = AF_INET; + + if (!cfig.ports[j]) + cfig.ports[j] = 69; + + cfig.tftpConn[i].addr.sin_addr.s_addr = cfig.servers[j]; + cfig.tftpConn[i].addr.sin_port = htons(cfig.ports[j]); + + socklen_t nRet = bind(cfig.tftpConn[i].sock, + (sockaddr*)&cfig.tftpConn[i].addr, + sizeof(struct sockaddr_in) + ); + + if (nRet == SOCKET_ERROR) + { + closesocket(cfig.tftpConn[i].sock); + sprintf(logBuff, "%s Port %u, bind failed", IP2String(tempbuff, cfig.servers[j]), cfig.ports[j]); + logMess(logBuff, 1); + continue; + } + + if (cfig.maxFD < cfig.tftpConn[i].sock) + cfig.maxFD = cfig.tftpConn[i].sock; + + cfig.tftpConn[i].server = cfig.tftpConn[i].addr.sin_addr.s_addr; + cfig.tftpConn[i].port = htons(cfig.tftpConn[i].addr.sin_port); + i++; + } + + cfig.maxFD++; + + if (!cfig.tftpConn[0].port) + { + sprintf(logBuff, "no listening interfaces available, stopping..\nPress Enter to exit\n"); + logMess(logBuff, 1); + getchar(); + exit(-1); + } + else if (verbatim) + { + printf("starting TFTP...\n"); + } + else + { + sprintf(logBuff, "starting TFTP service"); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS; i++) + if (cfig.homes[i].target[0]) + { + sprintf(logBuff, "alias /%s is mapped to %s", cfig.homes[i].alias, cfig.homes[i].target); + logMess(logBuff, 1); + } + + if (cfig.hostRanges[0].rangeStart) + { + char temp[128]; + + for (WORD i = 0; i <= sizeof(cfig.hostRanges) && cfig.hostRanges[i].rangeStart; i++) + { + sprintf(logBuff, "%s", "permitted clients: "); + sprintf(temp, "%s-", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeStart))); + strcat(logBuff, temp); + sprintf(temp, "%s", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeEnd))); + strcat(logBuff, temp); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "%s", "permitted clients: all"); + logMess(logBuff, 1); + } + + if (cfig.minport) + { + sprintf(logBuff, "server port range: %u-%u", cfig.minport, cfig.maxport); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "server port range: all"); + logMess(logBuff, 1); + } + + sprintf(logBuff, "max blksize: %u", blksize); + logMess(logBuff, 1); + sprintf(logBuff, "default blksize: %u", 512); + logMess(logBuff, 1); + sprintf(logBuff, "default timeout: %u", timeout); + logMess(logBuff, 1); + sprintf(logBuff, "file read allowed: %s", cfig.fileRead ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file create allowed: %s", cfig.fileWrite ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file overwrite allowed: %s", cfig.fileOverwrite ? "Yes" : "No"); + logMess(logBuff, 1); + + if (!verbatim) + { + sprintf(logBuff, "logging: %s", cfig.logLevel > 1 ? "all" : "errors"); + logMess(logBuff, 1); + } + + lEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerLogEvent")); // object name + + if (lEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + tEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + FALSE, // Signalled + TEXT("AchalTFTServerThreadEvent")); // object name + + if (tEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + sEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerSocketEvent")); // object name + + if (sEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + cEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerCountEvent")); // object name + + if (cEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + if (minThreads) + { + for (int i = 0; i < minThreads; i++) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + + sprintf(logBuff, "thread pool size: %u", minThreads); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + sprintf(logBuff, "listening on: %s:%i", IP2String(tempbuff, cfig.tftpConn[i].server), cfig.tftpConn[i].port); + logMess(logBuff, 1); + } +} + +void logMess(char *logBuff, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + printf("%s\n", logBuff); + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + fprintf(cfig.logfile, "[%s] %s\n", currentTime, logBuff); + fflush(cfig.logfile); + } + SetEvent(lEvent); +} + +void logMess(request *req, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + { + if (!req->serverError.errormessage[0]) + sprintf(req->serverError.errormessage, strerror(errno)); + + if (req->path[0]) + printf("Client %s:%u %s, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + printf("Client %s:%u, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + } + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + + if (req->path[0]) + fprintf(cfig.logfile, "[%s] Client %s:%u %s, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + fprintf(cfig.logfile, "[%s] Client %s:%u, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + + fflush(cfig.logfile); + } + SetEvent(lEvent); +} Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.h (added) +++ trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,161 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* 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., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#ifdef _MSC_VER + #define strcasecmp _stricmp + #define _CRT_SECURE_NO_WARNINGS + #pragma comment(lib, "ws2_32.lib") + #pragma comment(lib, "iphlpapi.lib") +#endif + +//Constants +#define my_inet_addr inet_addr +#define MAX_SERVERS 8 + +//Structs +struct home +{ + char alias[64]; + char target[256]; +}; + +struct tftpConnType +{ + SOCKET sock; + sockaddr_in addr; + DWORD server; + WORD port; +}; + +struct acknowledgement +{ + WORD opcode; + WORD block; +}; + +struct message +{ + WORD opcode; + char buffer[514]; +}; + +struct tftperror +{ + WORD opcode; + WORD errorcode; + char errormessage[512]; +}; + +struct packet +{ + WORD opcode; + WORD block; + char buffer; +}; + +struct data12 +{ + DWORD rangeStart; + DWORD rangeEnd; +}; + +struct request +{ + timeval tv; + fd_set readfds; + time_t expiry; + SOCKET sock; + SOCKET knock; + BYTE sockInd; + BYTE attempt; + char path[256]; + FILE *file; + char *filename; + char *mode; + char *alias; + DWORD tsize; + DWORD fblock; + int bytesReady; + int bytesRecd; + int bytesRead[2]; + packet* pkt[2]; + sockaddr_in client; + socklen_t clientsize; + union + { + tftperror serverError; + message mesout; + acknowledgement acout; + }; + union + { + tftperror clientError; + message mesin; + acknowledgement acin; + }; + WORD blksize; + WORD timeout; + WORD block; + WORD tblock; +}; + +struct data2 +{ + WSADATA wsaData; + tftpConnType tftpConn[MAX_SERVERS]; + DWORD servers[MAX_SERVERS]; + WORD ports[MAX_SERVERS]; + home homes[8]; + FILE *logfile; + data12 hostRanges[32]; + char fileRead; + char fileWrite; + char fileOverwrite; + int minport; + int maxport; + SOCKET maxFD; + BYTE logLevel; +}; + +struct data15 +{ + union + { + //DWORD ip; + unsigned ip:32; + BYTE octate[4]; + }; +}; + +//Functions +void runProg(); +void processRequest(LPVOID lpParam); +char* myGetToken(char*, BYTE); +void init(); +bool cleanReq(request*); +bool getSection(char*, char*, BYTE, char*); +bool isIP(char*s); +char* myLower(char*); +char* myUpper(char*); +char* IP2String(char*, DWORD); +void printWindowsError(); +void logMess(request*, BYTE); +void logMess(char*, BYTE); Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.rbuild (added) +++ trunk/reactos/base/services/tftpd/tftpd.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,12 @@ +<module name="tftpd" type="win32cui" installbase="system32" installname="tftpd.exe" allowwarnings="true" unicode="no"> + <include base="reactos"></include> + <include base="telnetd">..</include> + + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>wine</library> + + <file>tftpd.cpp</file> +</module> Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain

2 1

Stubbing Block w TEB
by James Tabor 12 May '09

12 May '09

This should work! It's just writing zero into a place holder in TEB but it throws a exception and kills boot! Index: win32k/ntuser/misc.c =================================================================== --- win32k/ntuser/misc.c (revision 40892) +++ win32k/ntuser/misc.c (working copy) @@ -550,6 +550,7 @@ // ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! ci->pClientThreadInfo = NULL; ci->ppi = ti->ppi; + ci->pDeskInfo = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

5 6

RosBE 1.4.2 available, update highly recommended!
by Colin Finck 10 May '09

10 May '09

Hi everybody, Daniel and I just released the new version 1.4.2 of the ReactOS Build Environment for Windows and Unix. The most important part of this release is the addition of some environment variables containing the include directories of the host and target compilers as compiler flags. These variables might be required by rbuild in the near future, so the update to the new version is highly recommended. Besides, the GCC in RosBE-Windows 1.4.2 is now compiled for i686 or later CPUs, decreasing the compilation time by 5 minutes for Daniel. Hopefully another reason to make the update more attractive ;-) As always, you can get the latest release from https://sourceforge.net/project/showfiles.php?group_id=6553 Best regards, Colin

5 5

Re: [ros-dev] [ros-diffs] [janderwald] 40823: - Use a spinlock with list functions over interlocked list functions - Use a bitmap for storing reference count of the mappings as mapping are complete async and not very likely in determined order
by Alex Ionescu 07 May '09

07 May '09

RtlBitmap? Best regards, Alex Ionescu On Thu, May 7, 2009 at 12:58 AM, <janderwald(a)svn.reactos.org> wrote: > Author: janderwald > Date: Thu May 7 02:58:57 2009 > New Revision: 40823 > > URL: http://svn.reactos.org/svn/reactos?rev=40823&view=rev > Log: > - Use a spinlock with list functions over interlocked list functions > - Use a bitmap for storing reference count of the mappings as mapping are > complete async and not very likely in determined order > > Modified: > trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > > Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… > > ============================================================================== > --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > [iso-8859-1] (original) > +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c > [iso-8859-1] Thu May 7 02:58:57 2009 > @@ -14,6 +14,7 @@ > KSSTREAM_HEADER *Header; > PIRP Irp; > > + ULONG References; > ULONG NumTags; > PVOID * Tag; > }IRP_MAPPING, *PIRP_MAPPING; > @@ -141,6 +142,7 @@ > IN PIRP Irp) > { > PIRP_MAPPING Mapping; > + ULONG Index; > IIrpQueueImpl * This = (IIrpQueueImpl*)iface; > > Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), > TAG_PORTCLASS); > @@ -166,7 +168,6 @@ > { > Mapping->NumTags++; > } > - ASSERT(Mapping->NumTags < 32); > } > } > else > @@ -181,12 +182,18 @@ > FreeItem(Mapping, TAG_PORTCLASS); > return STATUS_UNSUCCESSFUL; > } > + ASSERT(Mapping->NumTags < 32); > + for(Index = 0; Index < Mapping->NumTags; Index++); > + Mapping->References |= (1 << Index); > > This->NumDataAvailable += Mapping->Header->DataUsed; > > - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu > NumDataAvailable %lu Mapping %p NumTags %u FrameSize %u\n", > This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, > Mapping, Mapping->NumTags, This->MaxFrameSize); > - > - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, > &This->Lock); > + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu > NumDataAvailable %lu Mapping %p NumTags %u References %x FrameSize %u\n", > This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, > Mapping, Mapping->NumTags, Mapping->References, This->MaxFrameSize); > + > + KeAcquireSpinLockAtDpcLevel(&This->Lock); > + InsertTailList(&This->ListHead, &Mapping->Entry); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > (void)InterlockedIncrement((volatile long*)&This->NumMappings); > > if (Irp) > @@ -253,7 +260,10 @@ > { > This->CurrentOffset = 0; > > - (void)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); > + KeAcquireSpinLockAtDpcLevel(&This->Lock); > + RemoveHeadList(&This->ListHead); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > InterlockedDecrement(&This->NumMappings); > FreeMappingRoutine(CurMapping); > } > @@ -339,7 +349,7 @@ > > /* calculate the offset */ > if (Index) > - Offset = (Index + 1) * This->MaxFrameSize; > + Offset = Index * This->MaxFrameSize; > else > Offset = 0; > > @@ -416,6 +426,7 @@ > KeReleaseSpinLockFromDpcLevel(&This->Lock); > This->OutOfMapping = TRUE; > This->StartStream = FALSE; > + DPRINT("No Mapping available\n"); > return STATUS_UNSUCCESSFUL; > } > > @@ -425,9 +436,9 @@ > IN IIrpQueue *iface, > IN PVOID Tag) > { > - PIRP_MAPPING CurMapping; > + PIRP_MAPPING CurMapping = NULL; > PLIST_ENTRY CurEntry; > - ULONG Index; > + ULONG Index = 0; > ULONG Found; > IIrpQueueImpl * This = (IIrpQueueImpl*)iface; > > @@ -440,40 +451,48 @@ > return STATUS_UNSUCCESSFUL; > } > > - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > Found = FALSE; > - > - for(Index = 0; Index < CurMapping->NumTags; Index++) > - { > - if (CurMapping->Tag[Index] == Tag) > + MapIndex = 0; > + while (CurEntry != &This->ListHead) > + { > + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > + for(Index = 0; Index < CurMapping->NumTags; Index++) > { > - Found = TRUE; > + if (CurMapping->Tag[Index] == Tag) > + { > + Found = TRUE; > + break; > + } > + } > + if (Found) > break; > - } > - } > - KeReleaseSpinLockFromDpcLevel(&This->Lock); > + > + CurEntry = CurEntry->Flink; > + } > > if (!Found) > { > - DPRINT("Tag %p not in first mapping %p\n", Tag, CurMapping); > - return STATUS_UNSUCCESSFUL; > - } > - > - if (Index != CurMapping->NumTags - 1) > + DPRINT1("Tag %p not found\n", Tag); > + ASSERT(Found); > + } > + DPRINT("References %x\n", CurMapping->References); > + CurMapping->References &= ~(1 << Index); > + > + if (CurMapping->References) > { > /* released mapping is not the last mapping of the irp */ > - DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags > %u\n", Tag, Index, CurMapping->NumTags); > + DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags > %u Refs %x\n", Tag, Index, CurMapping->NumTags, CurMapping->References); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > return STATUS_SUCCESS; > } > > - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); > - ASSERT(CurEntry); > - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); > + RemoveEntryList(&CurMapping->Entry); > > /* last mapping of the irp, free irp */ > DPRINT("Freeing mapping %p\n", CurMapping); > InterlockedDecrement(&This->NumMappings); > FreeMappingRoutine(CurMapping); > + KeReleaseSpinLockFromDpcLevel(&This->Lock); > > return STATUS_SUCCESS; > } > > Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… > > ============================================================================== > --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > [iso-8859-1] (original) > +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c > [iso-8859-1] Thu May 7 02:58:57 2009 > @@ -636,6 +636,7 @@ > if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) > { > /* notify port driver that new mapping is available */ > + DPRINT("Notifying of new mapping\n"); > This->Stream->lpVtbl->MappingAvailable(This->Stream); > } > > >

1 0

announcing roscms4 beta
by Danny Götte 05 May '09

05 May '09

As some of you already know, the ReactOS web team was working on roscms4 for some time. Now it has reached a point where we feel that it is stable. But before we run it in our production system we want to ensure that it runs correct, so we're starting a beta test. With this mail we'd like to invite everyone who has already worked with RosCMS, to do some testing and helping us to get a stable RosCMS. You can use your normal login data from www.reactos.org, we're using a copy from 5. May 2009. Beta-Test Website: http://backend.reactos.org Beta-Test RosCMS: http://backend.reactos.org/roscms please report bugs to http://roscms.dblounge.org/doku.php?id=bugs Thank you for helping

1 0

Re: [ros-dev] [ros-diffs] [hpoussin] 40710: Remove MachGetMemoryMap() and replace it by ArcGetMemoryDescriptor(). Rework memory initialization to use it. As a bonus, we're not limited anymore to 32 memory descriptors, and having more than 4GB of RAM doesn't lead to out of bounds accesses
by Timo Kreuzer 03 May '09

03 May '09

hpoussin(a)svn.reactos.org schrieb: > Author: hpoussin > Date: Mon Apr 27 00:22:16 2009 > New Revision: 40710 > > [...] > > Modified: > trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c > > Author: hpoussin > Date: Sat Apr 25 00:35:11 2009 > New Revision: 40686 > > [...] > > Modified: > trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c > trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c > Umm, how did you manage to do that? These files don't/shouldn't even exist. Are you using git? Or voodoo? Black magic haxx0ry? ;) Timo

1 0

Bugzilla categories and default CC
by Colin Finck 02 May '09

02 May '09

Hello devs, Cameron just asked whether I could configure Bugzilla to automatically add him to the CC list for "Networking" bugs. This was done now. If you want to be automatically on the CC list for a specific bug category as well, just let me know and I'll add you. Maybe it's even time to rethink our categories and use more practical ones. I'm open for constructive ideas in this direction. Best regards, Colin

1 0

Re : [Qemu-devel] Atheros Wireless Device Emulation
by Sylvain Petreolle 27 Apr '09

27 Apr '09

Hi Clemens, I wonder if you still maintain this code ? Qemu has recently changed the way to manage network devices, and I had to do changes to keep it working. This worked like an charm until today, and is still interesting me as Im beginning tests for wireless nics in ReactOS. CCing ros-dev mailing list in case someone has it already built it in. Kind regards, Sylvain Petreolle ----- Message d'origine ---- > De : Clemens Kolbitsch <clemens.kol(a)gmx.at> > À : qemu-devel(a)nongnu.org > Envoyé le : Jeudi, 28 Février 2008, 15h12mn 09s > Objet : [Qemu-devel] Atheros Wireless Device Emulation > > Hi! > This patch adds virtual wireless networking support to qemu-0.9.1. > Besides being funny having a wireless LAN in Qemu, I guess wireless driver > developers could use this a lot. > > I have 3 screenshots here: > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_hardware.jpg > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_connecting.jpg > http://stud4.tuwien.ac.at/~e0126605/qemu_atheros/atheros_wlan_connected.jpg > > > Some infos about the emulation: > - We simulate an Atheros AR5212 NIC > - Additionally, we have a virutal access point that can > be used to connect to Qemu > - The code is based on ath5k reverse engineering from > about 10 months ago. I did not check what these guys > did since then. > - I added tons of hours doing reverse engineering.. but the > code is still a MESS! I'm sorry, but at least it works ;-) > - We can simulate different network card vendors. I.e. > through an additional model-name, we can specify if the > network card is identified as "Atheros XXXX" or "HP W400", etc. > ---> different drivers are installed automatically by guest system > - The hardware reverse engineering still lacks some stuff. Known > problems: > * Depending on the driver, you have to use a different model > ---> official windows drivers VS. madwifi Linux driver > * Newest madwifi code probably does not work > ---> Use Madwifi 0.9.3. Works just fine ;-) > - The networking-code is still a *little* ugly. Outbound connections > work, but there seem to be problems for inbound connections (e.g. > tcp-redirection, etc.) > - VM Snapshots supported > > Some infos about the patch: > - 2 lines added to pci.c > - added function declaration to pci.h > - patched Makefile.target (2 lines) > - added files qemu/hw/atheros_wlan_.*.[ch] > - took 2 files from wireshark to generate CRC32 checksums > - took 3 files from ath5k > ---> licence people, please have a look if that is ok!! > > Enabling emulation: > > As I wrote above, there are still problems when using the same code for > windows and linux guests. The model parameter helps here. Using the NIC on > windows (that's how I tested): > > qemu ... -net user -net nic,model=atheros_wlan_winxp_HPW400 ... > > and > > qemu ... -net user -net nic,model=atheros_wlan_linux_HPW400 ... > > for Linux systems. > > The "atheros_wlan" is the device itself, "_linux" / "_windows" is necessary > because the reverse engineering is still buggy and "_HPW400" gives the NIC > identification for the guest. HPW400 is the Hewlett-Packard W400 device, but > there are some more (see the atheros_wlan_eeprom.h for details). > > I have used the device on Debian (Kubuntu) Linux. The guests were WinXP-SP2 > and Kubuntu Linux, Kernel 2.6.20, MadWifi 0.9.3. My system is x86, so there > might be problems with big/little endian I am not aware of!! > > Please try the patch and let me know what you think of it!! > > Greets, > Clemens

1 0

Re: [ros-dev] [ros-diffs] [janderwald] 40694: - Fix allocation of CM_RESOURCE_LIST - Might fix bug 4354 See issue #4354 for more details.
by Timo Kreuzer 25 Apr '09

25 Apr '09

Isn't that actually the same? It also ignores the number of full descriptors, which I guess is wrong. And it looks like the whole parsing code is broken. It ignores the number of partial descriptors and does FullList++ Timo janderwald(a)svn.reactos.org schrieb: > Author: janderwald > Date: Sat Apr 25 16:05:08 2009 > New Revision: 40694 > > URL: http://svn.reactos.org/svn/reactos?rev=40694&view=rev > Log: > - Fix allocation of CM_RESOURCE_LIST > - Might fix bug 4354 > See issue #4354 for more details. > > Modified: > trunk/reactos/drivers/video/videoprt/dispatch.c > > Modified: trunk/reactos/drivers/video/videoprt/dispatch.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… > ============================================================================== > --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Sat Apr 25 16:05:08 2009 > @@ -340,9 +340,11 @@ > > /* Save the resource list */ > ResourceCount = AllocatedResources->List[0].PartialResourceList.Count; > - ResourceListSize = > - FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. > - PartialDescriptors[ResourceCount]); > + ResourceListSize = sizeof(CM_RESOURCE_LIST); > + > + if (ResourceCount > 1) > + ResourceListSize += (ResourceCount-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); > + > DeviceExtension->AllocatedResources = ExAllocatePool(PagedPool, ResourceListSize); > if (DeviceExtension->AllocatedResources == NULL) > { > > >

2 2

Release testing apps list issues
by Olaf Siejka 25 Apr '09

25 Apr '09

I feel that some things really need to be clearly explained, regarding apps being use to test releases with. At the moment, despite numerous attempts, i failed to find who (if anyone) is responsible for compiling and maintaining the list of apps used for release version testing. Especially, the non-downloader stuff section is basically changing completely with every release, making those tests virtually pointless, if we cant keep any consistency. On the other hand, looks like no one is responsible for maintaining Downloader app list. Without such responsibilites set, we are slipping into disorganisation, which is both confusing and uproductive. Clear policies should be set and observed in this matter, taking care of such basic thing as adding/linking/opening a bug report for an app that failed in release Test. I feel that testers have more productive things to do, than cleaning up/sorting test entries, incorrectly made up by first timers. Sorry if anyone feels this post to sound harsh, but its still really gentle and kind, compared to obscenities, curses and swears others have to put up, when i vent out after seeing the current state of Release testing wiki.

3 2

Mirroring?
by Administrador 25 Apr '09

25 Apr '09

HI! I was wondering if you people were interested in a new ISO/QUEMU/VMWARE download mirror, I got space and on my server and I would like to help this wonder full project. If the service I'm offering you for free please answer back with the information for starting "mirroring" Here's my server's information: Conection speed: VLAN on 100Mbits Mirroring protocol: HTTP Space reserved for ReactOS: 7GB, Bandwith: Unlimited Bandwith Waiting your answer, Jorge Guerra Kernel Error Administrator Will Rogers <http://www.brainyquote.com/quotes/authors/w/will_rogers.html> - "I don't make jokes. I just watch the government and report the facts."

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 40644: - Add Font Embedding Dll (it is necessary for Iron and Chrome)
by Ged 22 Apr '09

22 Apr '09

Wine have been running Google Chrome for a while now. Why don’t they have this dll if it's necessary???? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 22 April 2009 09:51 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 40644: - Add Font Embedding Dll (it is necessary for Iron and Chrome) Author: dchapyshev Date: Wed Apr 22 12:51:09 2009 New Revision: 40644 URL: http://svn.reactos.org/svn/reactos?rev=40644&view=rev Log: - Add Font Embedding Dll (it is necessary for Iron and Chrome) Added: trunk/reactos/dll/win32/t2embed/ (with props) trunk/reactos/dll/win32/t2embed/t2embed.c (with props) trunk/reactos/dll/win32/t2embed/t2embed.rbuild (with props) trunk/reactos/dll/win32/t2embed/t2embed.rc (with props) trunk/reactos/dll/win32/t2embed/t2embed.spec (with props) trunk/reactos/include/psdk/t2embapi.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=406… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -13,6 +13,7 @@ <property name="BASEADDRESS_WLANAPI" value="0x470F0000" /> <property name="BASEADDRESS_PIDGEN" value="0x473e0000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> + <property name="BASEADDRESS_T2EMBED" value="0x4b310000" /> <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> <property name="BASEADDRESS_MSFTEDIT" value="0x4b460000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -412,6 +412,7 @@ dll\win32\sti\sti.dll 1 dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 +dll\win32\t2embed\t2embed.dll 1 dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 dll\win32\traffic\traffic.dll 1 Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Apr 22 12:51:09 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/t2embed/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/t2embed/t2embed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.c (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.c [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,205 @@ +/* + * PROJECT: Font Embedding Dll + * FILE: dll\win32\t2embed\t2embed.c + * PURPOSE: Main file + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <t2embapi.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(t2embed); + +LONG +WINAPI +TTCharToUnicode(HDC hDC, + UCHAR* pucCharCodes, + ULONG ulCharCodeSize, + USHORT* pusShortCodes, + ULONG ulShortCodeSize, + ULONG ulFlags) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTDeleteEmbeddedFont(HANDLE hFontReference, + ULONG ulFlags, + ULONG* pulStatus) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFont(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontFromFileA(HDC hDC, + LPCSTR szFontFileName, + USHORT usTTCIndex, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEnableEmbeddingForFacename(LPSTR lpszFacename, + BOOL bEnable) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetEmbeddedFontInfo(ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + TTLOADINFO* pTTLoadInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetEmbeddingType(HDC hDC, + ULONG* pulPrivStatus) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTIsEmbeddingEnabled(HDC hDC, + BOOL* pbEnabled) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, + BOOL* pbEnabled) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTLoadEmbeddedFont(HANDLE *phFontReference, + ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, + TTLOADINFO* pTTLoadInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTests(HDC hDC, + TTVALIDATIONTESTPARAMS* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTEmbedFontEx(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + ULONG* pulCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTRunValidationTestsEx(HDC hDC, + TTVALIDATIONTESTPARAMSEX* pTestParam) +{ + UNIMPLEMENTED; + return E_NONE; +} + +LONG +WINAPI +TTGetNewFontName(HANDLE* phFontReference, + LPWSTR szWinFamilyName, + long cchMaxWinName, + LPSTR szMacFamilyName, + long cchMaxMacName) +{ + UNIMPLEMENTED; + return E_NONE; +} + + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/t2embed/t2embed.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.rbuild (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,13 @@ +<module name="t2embed" type="win32dll" baseaddress="${BASEADDRESS_T2EMBED}" installbase="system32" installname="t2embed.dll" unicode="yes"> + <importlibrary definition="t2embed.spec" /> + <include base="t2embed">.</include> + <include base="ReactOS">include/reactos/wine</include> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>advapi32</library> + <library>version</library> + <library>wine</library> + <file>t2embed.c</file> + <file>t2embed.rc</file> +</module> Propchange: trunk/reactos/dll/win32/t2embed/t2embed.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.rc (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.rc [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Font Embedding Dll\0" +#define REACTOS_STR_INTERNAL_NAME "t2embed\0" +#define REACTOS_STR_ORIGINAL_FILENAME "t2embed.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/t2embed/t2embed.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/t2embed/t2embed.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/t2embed.… ============================================================================== --- trunk/reactos/dll/win32/t2embed/t2embed.spec (added) +++ trunk/reactos/dll/win32/t2embed/t2embed.spec [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,25 @@ +@ stdcall TTCharToUnicode(ptr ptr long ptr long long) +@ stdcall TTDeleteEmbeddedFont(ptr long ptr) +@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTEmbedFontFromFileA(ptr str long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTEnableEmbeddingForFacename(str long) +@ stdcall TTGetEmbeddedFontInfo(long ptr long ptr ptr ptr ptr) +@ stdcall TTGetEmbeddingType(ptr ptr) +@ stdcall TTIsEmbeddingEnabled(ptr ptr) +@ stdcall TTIsEmbeddingEnabledForFacename(str ptr) +@ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) +@ stdcall TTRunValidationTests(ptr ptr) +@ stub _TTCharToUnicode@24 +@ stub _TTDeleteEmbeddedFont@12 +@ stub _TTEmbedFont@44 +@ stub _TTEmbedFontFromFileA@52 +@ stub _TTEnableEmbeddingForFacename@8 +@ stub _TTGetEmbeddedFontInfo@28 +@ stub _TTGetEmbeddingType@8 +@ stub _TTIsEmbeddingEnabled@8 +@ stub _TTIsEmbeddingEnabledForFacename@8 +@ stub _TTLoadEmbeddedFont@40 +@ stub _TTRunValidationTests@8 +@ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall TTRunValidationTestsEx(ptr ptr) +@ stdcall TTGetNewFontName(ptr wstr long str long) Propchange: trunk/reactos/dll/win32/t2embed/t2embed.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -511,6 +511,9 @@ <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory> +<directory name="t2embed"> + <xi:include href="t2embed/t2embed.rbuild" /> +</directory> <directory name="tapi32"> <xi:include href="tapi32/tapi32.rbuild" /> </directory> Added: trunk/reactos/include/psdk/t2embapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/t2embapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/t2embapi.h (added) +++ trunk/reactos/include/psdk/t2embapi.h [iso-8859-1] Wed Apr 22 12:51:09 2009 @@ -1,0 +1,286 @@ +#ifndef __T2EMBED_API_H +#define __T2EMBED_API_H + +#ifndef CHARSET_UNICODE +#define CHARSET_UNICODE 1 +#define CHARSET_DEFAULT 1 +#define CHARSET_SYMBOL 2 +#define CHARSET_GLYPHIDX 3 +#endif + +#ifndef EMBED_PREVIEWPRINT +#define EMBED_PREVIEWPRINT 1 +#define EMBED_EDITABLE 2 +#define EMBED_INSTALLABLE 3 +#define EMBED_NOEMBEDDING 4 +#endif + +#ifndef LICENSE_INSTALLABLE +#define LICENSE_INSTALLABLE 0x0 +#define LICENSE_DEFAULT 0x0 +#define LICENSE_NOEMBEDDING 0x2 +#define LICENSE_PREVIEWPRINT 0x4 +#define LICENSE_EDITABLE 0x8 +#endif + +#ifndef TTEMBED_RAW +#define TTEMBED_RAW 0x0 +#define TTEMBED_SUBSET 0x1 +#define TTEMBED_TTCOMPRESSED 0x4 +#define TTEMBED_FAILIFVARIATIONSIMULATED 0x10 +#define TTEMBED_EMBEDEUDC 0x20 +#define TTEMBED_VALIDATIONTESTS 0x40 +#define TTEMBED_WEBOBJECT 0x80 +#define TTEMBED_ENCRYPTDATA 0x10000000 +#endif + +#ifndef E_NONE +#define E_NONE 0x0 +#endif + +#ifndef E_CHARCODECOUNTINVALID +#define E_CHARCODECOUNTINVALID 0x2 +#define E_CHARCODESETINVALID 0x3 +#define E_DEVICETRUETYPEFONT 0x4 +#define E_HDCINVALID 0x6 +#define E_NOFREEMEMORY 0x7 +#define E_FONTREFERENCEINVALID 0x8 +#define E_NOTATRUETYPEFONT 0xA +#define E_ERRORACCESSINGFONTDATA 0xC +#define E_ERRORACCESSINGFACENAME 0xD +#define E_ERRORUNICODECONVERSION 0x11 +#define E_ERRORCONVERTINGCHARS 0x12 +#define E_EXCEPTION 0x13 +#define E_RESERVEDPARAMNOTNULL 0x14 +#define E_CHARSETINVALID 0x15 +#define E_WIN32S_NOTSUPPORTED 0x16 +#define E_FILE_NOT_FOUND 0x17 +#define E_TTC_INDEX_OUT_OF_RANGE 0x18 +#define E_INPUTPARAMINVALID 0x19 +#endif + +#ifndef E_ERRORCOMPRESSINGFONTDATA +#define E_ERRORCOMPRESSINGFONTDATA 0x100 +#define E_FONTDATAINVALID 0x102 +#define E_NAMECHANGEFAILED 0x103 +#define E_FONTNOTEMBEDDABLE 0x104 +#define E_PRIVSINVALID 0x105 +#define E_SUBSETTINGFAILED 0x106 +#define E_READFROMSTREAMFAILED 0x107 +#define E_SAVETOSTREAMFAILED 0x108 +#define E_NOOS2 0x109 +#define E_T2NOFREEMEMORY 0x10A +#define E_ERRORREADINGFONTDATA 0x10B +#define E_FLAGSINVALID 0x10C +#define E_ERRORCREATINGFONTFILE 0x10D +#define E_FONTALREADYEXISTS 0x10E +#define E_FONTNAMEALREADYEXISTS 0x10F +#define E_FONTINSTALLFAILED 0x110 +#define E_ERRORDECOMPRESSINGFONTDATA 0x111 +#define E_ERRORACCESSINGEXCLUDELIST 0x112 +#define E_FACENAMEINVALID 0x113 +#define E_STREAMINVALID 0x114 +#define E_STATUSINVALID 0x115 +#define E_PRIVSTATUSINVALID 0x116 +#define E_PERMISSIONSINVALID 0x117 +#define E_PBENABLEDINVALID 0x118 +#define E_SUBSETTINGEXCEPTION 0x119 +#define E_SUBSTRING_TEST_FAIL 0x11A +#define E_FONTVARIATIONSIMULATED 0x11B +#define E_FONTVALIDATEFAIL 0x11C +#define E_FONTFAMILYNAMENOTINFULL 0x11D +#endif + +#ifndef E_ADDFONTFAILED +#define E_ADDFONTFAILED 0x200 +#define E_COULDNTCREATETEMPFILE 0x201 +#define E_FONTFILECREATEFAILED 0x203 +#define E_WINDOWSAPI 0x204 +#define E_FONTFILENOTFOUND 0x205 +#define E_RESOURCEFILECREATEFAILED 0x206 +#define E_ERROREXPANDINGFONTDATA 0x207 +#define E_ERRORGETTINGDC 0x208 +#define E_EXCEPTIONINDECOMPRESSION 0x209 +#define E_EXCEPTIONINCOMPRESSION 0x20A +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef unsigned long(WINAPIV *WRITEEMBEDPROC) +( + void* lpvWriteStream, + const void* lpvBuffer, + const unsigned long cbBuffer +); + +typedef unsigned long(WINAPIV *READEMBEDPROC) +( + void* lpvReadStream, + void* lpvBuffer, + const unsigned long cbBuffer +); + + +typedef struct +{ + unsigned long ulStructSize; + long lTestFromSize; + long lTestToSize; + unsigned long ulCharSet; + unsigned short usReserved1; + unsigned short usCharCodeCount; + unsigned short* pusCharCodeSet; +} TTVALIDATIONTESTPARAMS; + +typedef struct +{ + unsigned long ulStructSize; + long lTestFromSize; + long lTestToSize; + unsigned long ulCharSet; + unsigned short usReserved1; + unsigned short usCharCodeCount; + unsigned long* pulCharCodeSet; +} TTVALIDATIONTESTPARAMSEX; + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRootStrSize; + unsigned short *pusRootStr; +} TTEMBEDINFO; + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRefStrSize; + unsigned short *pusRefStr; +} TTLOADINFO; + +LONG +WINAPI +TTCharToUnicode(HDC hDC, + UCHAR* pucCharCodes, + ULONG ulCharCodeSize, + USHORT* pusShortCodes, + ULONG ulShortCodeSize, + ULONG ulFlags); + +LONG +WINAPI +TTDeleteEmbeddedFont(HANDLE hFontReference, + ULONG ulFlags, + ULONG* pulStatus); + +LONG +WINAPI +TTEmbedFont(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTEmbedFontFromFileA(HDC hDC, + LPCSTR szFontFileName, + USHORT usTTCIndex, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + USHORT* pusCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTEnableEmbeddingForFacename(LPSTR lpszFacename, + BOOL bEnable); + +LONG +WINAPI +TTGetEmbeddedFontInfo(ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + TTLOADINFO* pTTLoadInfo); + +LONG +WINAPI +TTGetEmbeddingType(HDC hDC, + ULONG* pulPrivStatus); + +LONG +WINAPI +TTIsEmbeddingEnabled(HDC hDC, + BOOL* pbEnabled); + +LONG +WINAPI +TTIsEmbeddingEnabledForFacename(LPSTR lpszFacename, + BOOL* pbEnabled); + +LONG +WINAPI +TTLoadEmbeddedFont(HANDLE *phFontReference, + ULONG ulFlags, + ULONG* pulPrivStatus, + ULONG ulPrivs, + ULONG* pulStatus, + READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, + LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, + TTLOADINFO* pTTLoadInfo); + +LONG +WINAPI +TTRunValidationTests(HDC hDC, + TTVALIDATIONTESTPARAMS* pTestParam); + +LONG +WINAPI +TTEmbedFontEx(HDC hDC, + ULONG ulFlags, + ULONG ulCharSet, + ULONG* pulPrivStatus, + ULONG* pulStatus, + WRITEEMBEDPROC lpfnWriteToStream, + LPVOID lpvWriteStream, + ULONG* pulCharCodeSet, + USHORT usCharCodeCount, + USHORT usLanguage, + TTEMBEDINFO* pTTEmbedInfo); + +LONG +WINAPI +TTRunValidationTestsEx(HDC hDC, + TTVALIDATIONTESTPARAMSEX* pTestParam); + +LONG +WINAPI +TTGetNewFontName(HANDLE* phFontReference, + LPWSTR szWinFamilyName, + long cchMaxWinName, + LPSTR szMacFamilyName, + long cchMaxMacName); + +#ifdef __cplusplus + } +#endif + +#endif /* __T2EMBED_API_H */ Propchange: trunk/reactos/include/psdk/t2embapi.h ------------------------------------------------------------------------------ svn:eol-style = native

3 3

Re: [ros-dev] [ros-diffs] [mjmartin] 40630: - edit.c: Add TPM_RETURNCMD flag to TrackPopupMenu so that WM_COMMAND messages are not sent to the edit control. Use WM_MENUSELECT vice WM_COMMAND to determine which clipboard message to send. - Fixes vb apps edit context menu and maybe others. Bug #4404
by Timo Kreuzer 22 Apr '09

22 Apr '09

edit.c is shared with wine. Also using a static variable here looks like a bad idea. I would think that the problem is somewhere else. mjmartin(a)svn.reactos.org schrieb: > Author: mjmartin > Date: Tue Apr 21 08:45:08 2009 > New Revision: 40630 > > URL: http://svn.reactos.org/svn/reactos?rev=40630&view=rev > Log: > - edit.c: Add TPM_RETURNCMD flag to TrackPopupMenu so that WM_COMMAND messages are not sent to the edit control. > Use WM_MENUSELECT vice WM_COMMAND to determine which clipboard message to send. > - Fixes vb apps edit context menu and maybe others. Bug #4404 > > Modified: > trunk/reactos/dll/win32/user32/controls/edit.c > > Modified: trunk/reactos/dll/win32/user32/controls/edit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… > ============================================================================== > --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Tue Apr 21 08:45:08 2009 > @@ -255,7 +255,7 @@ > * WM_XXX message handlers > */ > static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); > -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); > +static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND conrtol); > static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); > static void EDIT_WM_Copy(EDITSTATE *es); > static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); > @@ -947,8 +947,8 @@ > EDIT_WM_Clear(es); > break; > > - case WM_COMMAND: > - EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); > + case WM_MENUSELECT: > + EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); > break; > > case WM_CONTEXTMENU: > @@ -4224,12 +4224,17 @@ > * WM_COMMAND > * > */ > -static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) > -{ > - if (code || control) > +static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND control) > +{ > + > + static INT MenuSelected; > + > + if (id != 0) { > + MenuSelected = id; > return; > - > - switch (id) { > + } > + > + switch (MenuSelected) { > case EM_UNDO: > SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); > break; > @@ -4308,7 +4313,7 @@ > y = rc.top + (rc.bottom - rc.top) / 2; > } > > - TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); > + TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); > DestroyMenu(menu); > } > > > >

2 3

Re: [ros-dev] [ros-diffs] [mjmartin] 40557: - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424.
by Timo Kreuzer 21 Apr '09

21 Apr '09

Can you explain, why the variables need to be volatile? This looks like a SEH problem. mjmartin(a)svn.reactos.org schrieb: > Author: mjmartin > Date: Fri Apr 17 13:59:03 2009 > New Revision: 40557 > > URL: http://svn.reactos.org/svn/reactos?rev=40557&view=rev > Log: > - Add volatile to variables in OutputDebugStringA. Fix #1 of ? for 3424. > > Modified: > trunk/reactos/dll/win32/kernel32/debug/output.c > > Modified: trunk/reactos/dll/win32/kernel32/debug/output.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Fri Apr 17 13:59:03 2009 > @@ -219,9 +219,9 @@ > static BOOL s_bDBMonMutexTriedOpen = FALSE; > > /* local copy of the mutex handle */ > - HANDLE hDBMonMutex = s_hDBMonMutex; > + volatile HANDLE hDBMonMutex = s_hDBMonMutex; > /* handle to the Section of the shared buffer */ > - HANDLE hDBMonBuffer = NULL; > + volatile HANDLE hDBMonBuffer = NULL; > > /* pointer to the mapped view of the shared buffer. It consist of the current > process id followed by the message string */ > @@ -229,11 +229,11 @@ > > /* event: signaled by the debug message monitor when OutputDebugString can write > to the shared buffer */ > - HANDLE hDBMonBufferReady = NULL; > + volatile HANDLE hDBMonBufferReady = NULL; > > /* event: to be signaled by OutputDebugString when it's done writing to the > shared buffer */ > - HANDLE hDBMonDataReady = NULL; > + volatile HANDLE hDBMonDataReady = NULL; > > /* mutex not opened, and no previous attempts to open/create it */ > if(hDBMonMutex == NULL && !s_bDBMonMutexTriedOpen) > @@ -295,10 +295,10 @@ > _SEH2_TRY > { > /* size of the current output block */ > - SIZE_T nRoundLen; > + volatile SIZE_T nRoundLen; > > /* size of the remainder of the string */ > - SIZE_T nOutputStringLen; > + volatile SIZE_T nOutputStringLen; > > /* output the whole string */ > nOutputStringLen = strlen(_OutputString); > @@ -339,11 +339,12 @@ > else > { > /* output in blocks of 512 characters */ > - CHAR a_cBuffer[512]; > + volatile PCHAR a_cBuffer; > + a_cBuffer = (CHAR*)HeapAlloc(GetProcessHeap(), 0, 512); > > /* write a maximum of 511 bytes */ > - if(nOutputStringLen > (sizeof(a_cBuffer) - 2)) > - nRoundLen = sizeof(a_cBuffer) - 2; > + if(nOutputStringLen > 510) > + nRoundLen = 510; > else > nRoundLen = nOutputStringLen; > > @@ -355,6 +356,8 @@ > > /* send the current block to the kernel debugger */ > DbgPrint("%s", a_cBuffer); > + > + HeapFree(GetProcessHeap(), 0, a_cBuffer); > } > > /* move to the next block */ > > >

4 3

Re: [ros-dev] [ros-diffs] [dreimer] 40619: Hopefully a REAL FIX for our new setlocal eats up vars problem
by Timo Kreuzer 21 Apr '09

21 Apr '09

Nope. I replaced my files with the new ones. Now I don't get any output about the compiler version etc at startup anymore and I cannot compile anything. dreimer(a)svn.reactos.org schrieb: > Author: dreimer > Date: Tue Apr 21 03:30:47 2009 > New Revision: 40619 > > URL: http://svn.reactos.org/svn/reactos?rev=40619&view=rev > Log: > Hopefully a REAL FIX for our new setlocal eats up vars problem > > Added: > trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (with props) > Modified: > trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd > > Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd > URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… > ============================================================================== > --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) > +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 > @@ -33,51 +33,12 @@ > goto :main > ) > > -setlocal enabledelayedexpansion > - > set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% > set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% > - > -if not "!_ROSBE_ARCH!" == "" ( > - set ROS_ARCH=!_ROSBE_ARCH! > - set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32 > - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!_ROSBE_ARCH! > - > - REM HAXX > - > - if "!_ROSBE_ARCH!" == "arm" ( > - set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! > - ) > - if "!_ROSBE_ARCH!" == "ppc" ( > - set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! > - ) > - if "!_ROSBE_ARCH!" == "amd64" ( > - set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! > - set ROS_PREFIX=x86_64-pc-mingw32 > - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 > - ) > - > - REM Check if existant arch > - > - if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( > - echo Unsupported arch specified. Fallback to Default. > - pause > - set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! > - set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! > - set ROS_ARCH= > - set ROS_PREFIX= > - set _ROSBE_TARGET_MINGWPATH= > - ) > -) > - > +"%_ROSBE_BASEDIR%\setlocal.cmd" > :: > :: Set up the GCC 4.x.x build environment. > :: > - > -endlocal > > :main > > > Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd > URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/set… > ============================================================================== > --- trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (added) > +++ trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 > @@ -1,0 +1,49 @@ > +:: > +:: PROJECT: RosBE - ReactOS Build Environment for Windows > +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) > +:: FILE: Root/setlocal.cmd > +:: PURPOSE: Bypass for the stupid setlocal in CMD Batch > +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> > +:: > +:: > +@echo off > +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 > +if %_ROSBE_DEBUG% == 1 ( > + @echo on > +) > + > + > +if not "%_ROSBE_ARCH%" == "" ( > + set ROS_ARCH=%_ROSBE_ARCH% > + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 > + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% > + > + REM HAXX > + > + if "%_ROSBE_ARCH%" == "arm" ( > + set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% > + ) > + if "%_ROSBE_ARCH%" == "ppc" ( > + set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% > + ) > + if "%_ROSBE_ARCH%" == "amd64" ( > + set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% > + set ROS_PREFIX=x86_64-pc-mingw32 > + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 > + ) > + > + REM Check if existant arch > + > + if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( > + echo Unsupported arch specified. Fallback to Default. > + pause > + set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% > + set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% > + set ROS_ARCH= > + set ROS_PREFIX= > + set _ROSBE_TARGET_MINGWPATH= > + ) > +) > > Propchange: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd > ------------------------------------------------------------------------------ > svn:eol-style = native > > >

1 0

0.3.9 Status
by Aleksey Bragin 18 Apr '09

18 Apr '09

Hi, by today most of the bugs which were having 0.3.9 as a milestone are fixed - including fixing 4-months old bug with richedit control, properly trimming DLL names during PE loading so that apps now can find their DLLs (previously that failed in some cases), newest downloader problem introduced yesterday and fixed today (not to speak about yesterday's fixes too!). This is a very good example of team collaboration, team effort aimed at a narrow set of problems. It worked very well, and I think we would utilise such bugfixing sessions in future too. Branching date is now set to tomorrow, 17th of April, 2009 and is not going to be changed anymore. As soon as the 0.3.9 branch is created, feature freeze is considered to be finished. After the release is branched, usual testing will be conducted, actual packages built and released as usual. Thank you for your efforts and for being patient with regards to the feature freeze. WBR, Aleksey Bragin.

2 3

Re: [ros-dev] [ros-diffs] [cfinck] 40579: Hack: Revert the dispatch routine for WM_SETREDRAW to the pre-Wine-1.1.7 version to hackfix mIRC and probably other applications using riched20.
by Aleksey Bragin 18 Apr '09

18 Apr '09

This shouldn't be necessary, it's fixed in trunk by 40545. WBR, Aleksey Bragin. On Apr 18, 2009, at 6:56 PM, cfinck(a)svn.reactos.org wrote: > Author: cfinck > Date: Sat Apr 18 18:56:16 2009 > New Revision: 40579 > > URL: http://svn.reactos.org/svn/reactos?rev=40579&view=rev > Log: > Hack: Revert the dispatch routine for WM_SETREDRAW to the pre- > Wine-1.1.7 version to hackfix mIRC and probably other applications > using riched20. > > Modified: > branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > > Modified: branches/ros-branch-0_3_9/reactos/dll/win32/riched20/ > editor.c > URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/ > reactos/dll/win32/riched20/editor.c? > rev=40579&r1=40578&r2=40579&view=diff > ====================================================================== > ======== > --- branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > [iso-8859-1] (original) > +++ branches/ros-branch-0_3_9/reactos/dll/win32/riched20/editor.c > [iso-8859-1] Sat Apr 18 18:56:16 2009 > @@ -4162,7 +4162,9 @@ > ME_SendRequestResize(editor, TRUE); > return 0; > case WM_SETREDRAW: > - goto do_default; > + if (wParam) > + ME_RewrapRepaint(editor); > + return 0; > case WM_SIZE: > { > RECT clientRect; >

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 40565: Begin Japanese translation of USetup
by Aleksey Bragin 17 Apr '09

17 Apr '09

Dmitry! Please! It's only a few hours left till we create a branch and normal development resumes! WBR, Aleksey Bragin. On Apr 18, 2009, at 1:01 AM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Sat Apr 18 01:01:56 2009 > New Revision: 40565 > > URL: http://svn.reactos.org/svn/reactos?rev=40565&view=rev > Log: > Begin Japanese translation of USetup > > Added: > trunk/reactos/media/vgafonts/932-8x8.bin (with props) > Modified: > trunk/reactos/base/setup/usetup/lang/ja-JP.h > trunk/reactos/base/setup/usetup/muifonts.h > trunk/reactos/base/setup/usetup/muilanguages.h > trunk/reactos/media/vgafonts/vgafonts.rbuild

1 0

Re: [ros-dev] [ros-diffs] [hyperion] 40541: This is why we can't have nice things. Reverting r40536, r40537, due to RosBE differences between Windows and Linux hosts (because RosBE sucks)
by Steven Edwards 16 Apr '09

16 Apr '09

On Thu, Apr 16, 2009 at 12:57 AM, <hyperion(a)svn.reactos.org> wrote: > Author: hyperion > Date: Thu Apr 16 08:57:28 2009 > New Revision: 40541 > > URL: http://svn.reactos.org/svn/reactos?rev=40541&view=rev > Log: > This is why we can't have nice things. Reverting r40536, r40537, due to RosBE differences between Windows and Linux hosts (because RosBE sucks) I don't think this is fair to the guys that have put a lot of hard work in to RosBE. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 3

16 Apr '09

I called a feature freeze if you have not noticed. WBR, Aleksey Bragin. On Apr 16, 2009, at 6:27 AM, hyperion(a)svn.reactos.org wrote: > Author: hyperion > Date: Thu Apr 16 06:27:50 2009 > New Revision: 40538 > > URL: http://svn.reactos.org/svn/reactos?rev=40538&view=rev > Log: > Rbuild rationalization commit, umpteenth of infinite

2 1

Re: [ros-dev] [ros-diffs] General speech held by V?\195?\173ctor Mart?\195?\173nez (vicmarcal) and Javier Fernand?\195?\169z (elhoir) at Imagin?\195?\161tica 2009
by Colin Finck 16 Apr '09

16 Apr '09

> trunk/press-media/presentations/Imaginatica 2009/reactos_imaginatica.pptx Could we rather save such files as PPT? As far as I know, there is currently no loss in information if you save a file as PPT instead of PPTX in PowerPoint 2007. Furthermore, this makes it possible to open and edit such files with older PowerPoint versions or OpenOffice. Additionally, neither the PPTX import nor the ODP export (looking at the other Imaginatica presentation) of OpenOffice seem to work as reliable as the PPT import yet. Best regards, Colin

8 16

Re: [ros-dev] [ros-diffs] [sedwards] 40485: add telnet service, enable it by default
by Gabriel ilardi 15 Apr '09

15 Apr '09

This is a really nice feature, but why enabling it by default? XP SP3 default state is disabled. > Date: Mon, 13 Apr 2009 16:26:50 +0000 > To: ros-diffs(a)reactos.org > From: sedwards(a)svn.reactos.org > Subject: [ros-diffs] [sedwards] 40485: add telnet service, enable it by default > > Author: sedwards > Date: Mon Apr 13 20:26:49 2009 > New Revision: 40485 > > URL: http://svn.reactos.org/svn/reactos?rev=40485&view=rev > Log: > add telnet service, enable it by default > > Modified: > trunk/reactos/base/services/services.rbuild > trunk/reactos/base/services/telnetd/serviceentry.c > trunk/reactos/base/services/telnetd/telnetd.c > trunk/reactos/base/services/telnetd/telnetd.rbuild > trunk/reactos/boot/bootdata/hivesys_i386.inf > trunk/reactos/boot/bootdata/packages/reactos.dff > > Modified: trunk/reactos/base/services/services.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… > ============================================================================== > --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -22,6 +22,9 @@ > <directory name="tcpsvcs"> > <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> > </directory> > + <directory name="telnetd"> > + <xi:include href="telnetd/telnetd.rbuild" /> > + </directory> > <directory name="umpnpmgr"> > <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> > </directory> > > Modified: trunk/reactos/base/services/telnetd/serviceentry.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/serv… > ============================================================================== > --- trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -15,19 +15,15 @@ > * License along with this library; if not, write to the Free Software > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > -#if 0 > + > #define WIN32_LEAN_AND_MEAN > > #include <windows.h> > +#include "wine/debug.h" > > -#define WINE_FIXME printf > -#define WINE_TRACE printf > +WINE_DEFAULT_DEBUG_CHANNEL(telnetd); > > -//#include "wine/debug.h" > - > -//WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); > - > -static WCHAR telnetdW[] = {'T','e','l','n','e','t','D',0}; > +static WCHAR telnetdW[] = {'t','e','l','n','e','t','d',0}; > > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > @@ -106,6 +102,5 @@ > StartServiceCtrlDispatcherW(servtbl); > return 0; > } > -#endif > /* EOF */ > > > Modified: trunk/reactos/base/services/telnetd/telnetd.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… > ============================================================================== > --- trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -45,7 +45,7 @@ > * rename this function > * int kickoff_telnetd(void) > */ > -int main(int argc, char **argv) > +int kickoff_telnetd(void) > { > printf("Attempting to start Simple TelnetD\n"); > > > Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… > ============================================================================== > --- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -6,6 +6,7 @@ > <library>kernel32</library> > <library>advapi32</library> > <library>ws2_32</library> > + <library>wine</library> > > <file>telnetd.c</file> > <file>serviceentry.c</file> > > Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -1061,6 +1061,15 @@ > HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 > HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 > > +; ReactOS Telnet Daemon > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Description",0x00000000,"ReactOS Telnet Daemon" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","DisplayName",0x00000000,"ReactOS Telnet Daemon" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000002 > +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 > + > ; Sound Blaster (NT4) > ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" > ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 > > Modified: trunk/reactos/boot/bootdata/packages/reactos.dff > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… > ============================================================================== > --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 20:26:49 2009 > @@ -90,6 +90,7 @@ > base\services\rpcss\rpcss.exe 1 > base\services\spoolsv\spoolsv.exe 1 > base\services\tcpsvcs\tcpsvcs.exe 1 > +base\services\telnetd\telnetd.exe 1 > base\services\tcpsvcs\quotes 5 > base\services\umpnpmgr\umpnpmgr.exe 1 > base\services\wlansvc\wlansvc.exe 1 > _________________________________________________________________ Quante ne sai? Scoprilo con CrossWire! http://clk.atdmt.com/GBL/go/140630367/direct/01/

6 12

Re: [ros-dev] [ros-diffs] [sedwards] 40485: add telnet service, enable it by default
by WaxDragon 15 Apr '09

15 Apr '09

Those of us willing and able to help you test telnetd already are building rosapps. On Apr 15, 2009 2:13 AM, "Steven Edwards" <winehacker(a)gmail.com> wrote: On Tue, Apr 14, 2009 at 2:14 PM, Ged <gedmurphy(a)gmail.com> wrote: > Because we recently had a discus... Sure I agree with keeping down the build time but I thought we were going to implement a subset of build targets so the apps that make up the main distro would still be in the reactos checkout. If there is consensus that telnetd should be disabled or set to manual then I'll turn it off. Otherwise my plan was to leave it on until we reach 0.4 in the hopes that people would stress it out and help me develop it. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an id... Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 40480: - Add more check on CodePage = 0. +2 passed wine tests
by Aleksey Bragin 13 Apr '09

13 Apr '09

Shouldn't it have only the return STATUS_UNSUCCESSFUL; changed to return STATUS_INVALID_PARAMETER; in the original version? I doubt IsValidCodePage should return true for a 0 codepage. WBR, Aleksey Bragin. On Apr 13, 2009, at 4:33 PM, dchapyshev(a)svn.reactos.org wrote: > Author: dchapyshev > Date: Mon Apr 13 16:33:33 2009 > New Revision: 40480 > > URL: http://svn.reactos.org/svn/reactos?rev=40480&view=rev > Log: > - Add more check on CodePage = 0. +2 passed wine tests > > Modified: > trunk/reactos/subsystems/win32/csrss/win32csr/conio.c > > Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ > win32/csrss/win32csr/conio.c?rev=40480&r1=40479&r2=40480&view=diff > ====================================================================== > ======== > --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c > [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c > [iso-8859-1] Mon Apr 13 16:33:33 2009 > @@ -3023,12 +3023,20 @@ > > Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); > Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - > sizeof(PORT_MESSAGE); > - if (IsValidCodePage(Request- > >Data.SetConsoleOutputCodePage.CodePage)) > + if (Request->Data.SetConsoleOutputCodePage.CodePage == 0) > + { > + ConioUnlockConsole(Console); > + return STATUS_INVALID_PARAMETER; > + } > + else > + { > + if (IsValidCodePage(Request- > >Data.SetConsoleOutputCodePage.CodePage)) > { > Console->OutputCodePage = Request- > >Data.SetConsoleOutputCodePage.CodePage; > ConioUnlockConsole(Console); > return STATUS_SUCCESS; > } > + } > ConioUnlockConsole(Console); > return STATUS_UNSUCCESSFUL; > } >

1 0

Re: [ros-dev] [ros-diffs] [sedwards] 40481: move telnetd to main tree, not enabled yet
by Ged 13 Apr '09

13 Apr '09

Why? Do we really need a telnet server in trunk? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of sedwards(a)svn.reactos.org Sent: 13 April 2009 14:29 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [sedwards] 40481: move telnetd to main tree, not enabled yet Author: sedwards Date: Mon Apr 13 17:29:21 2009 New Revision: 40481 URL: http://svn.reactos.org/svn/reactos?rev=40481&view=rev Log: move telnetd to main tree, not enabled yet Added: trunk/reactos/base/services/telnetd/ (props changed) - copied from r40480, trunk/rosapps/applications/sysutils/telnetd/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Propchange: trunk/reactos/base/services/telnetd/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 17:29:21 2009 @@ -670,7 +670,6 @@ modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\telnetd\telnetd.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional

1 0

Year 2038 problem
by Javier Agustìn Fernàndez Arroyo 12 Apr '09

12 Apr '09

Hi all, i hope you have already taken into account this: http://en.wikipedia.org/wiki/Year_2038_problem Regards, Javier

7 10

Re: [ros-dev] [ros-diffs] [cgutman] 40471: - Don't close the connection handle and dereference the connection object when we run out of memory because it will cause a crash when AfdCleanupSocket tries to do the same - Fixes bug 4362
by Aleksey Bragin 12 Apr '09

12 Apr '09

On Apr 12, 2009, at 9:07 AM, cgutman(a)svn.reactos.org wrote: > - /* Is this correct? */ > - TdiCloseDevice( FCB->Connection.Handle, > - FCB->Connection.Object ); Turned out it was not :)

1 0

Downloader tool
by Ged 11 Apr '09

11 Apr '09

I think we should make an exception for the downloader tool and move it out of rosapps into the main source. I think the argument for having it in there would exceed the argument against. Any thoughts?

10 13

Alexandre Julliard : include: Update and document the TEB/ PEB offsets on 64-bit.
by James Tabor 10 Apr '09

10 Apr '09

http://www.winehq.org/pipermail/wine-cvs/2009-April/054575.html LOL with tears, The accuracy of this will kill your research and give you a headache. It is so sad for a professional to commit and propagate misinformation, it smacks of counterintelligences. I'm starting to feel sorry for that project. It's not a state secret to match what is published as a standard from microsoft. 8^( James

3 3

Re: [ros-dev] [ros-diffs] [fireball] 40430: - Make it possible to assign drive letters to all partitions, not only to the first partition of a primary partition table. - Make AssignDriveLetters in partlist.c to actually assign drive letters to all partitions found (the list corresponds to how Windows 2003 install CD assign driver letters, but more investigation would not hurt). - Make CheckActiveBootPartition actually search for partition with a boot flag, instead of hardcoding it to partition 0 of disk 0.
by Aleksey Bragin 10 Apr '09

10 Apr '09

It's a stoneage "bug", which was present from the very beginning of ReactOS's installer (usetup) - it read, recognized and could be installed only on the first primary partition. Now, after my today's commits it recognizes and could be installed to any primary partition. Extended partitions logic was not changed, was not tested and hopefully didn't regress (if it was existing at all). However, there is still a bug preventing booting ReactOS from non- first partition, probably due to incorrect freeldr.ini. Everyone is welcome to have a look and try to fix it. Also, very important, don't use create/delete partition functionality - it's good only to create or delete only one primary partition. If you use it with multiple primary partitions, it's gonna mess up everything. Again, patches are welcome. WBR, Aleksey Bragin. On Apr 9, 2009, at 10:59 PM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Thu Apr 9 22:59:28 2009 > New Revision: 40430 > > URL: http://svn.reactos.org/svn/reactos?rev=40430&view=rev > Log: > - Make it possible to assign drive letters to all partitions, not > only to the first partition of a primary partition table. > - Make AssignDriveLetters in partlist.c to actually assign drive > letters to all partitions found (the list corresponds to how > Windows 2003 install CD assign driver letters, but more > investigation would not hurt). > - Make CheckActiveBootPartition actually search for partition with > a boot flag, instead of hardcoding it to partition 0 of disk 0. > - Fix SetMountedDeviceValues to take multiple partitions in a > partition table into account. > - Fix Select Partition, Format Partition, Check File System, Delete > Partition interface page to take partition number into account. > - IMPORTANT: Create/Delete partitions must not be used to > repartition the harddrive! They can only be used to create/delete > an initial primary partition on a clean harddisk. > > Modified: > trunk/reactos/base/setup/usetup/interface/usetup.c > trunk/reactos/base/setup/usetup/partlist.c > trunk/reactos/base/setup/usetup/partlist.h

2 1

Re: [ros-dev] [ros-diffs] [fireball] 40428: - Recognize up to 4 partitions inside every primary partition table. However, installation will be performed to the first partition anyway.
by Steven Edwards 09 Apr '09

09 Apr '09

On Thu, Apr 9, 2009 at 8:42 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Thu Apr 9 16:42:09 2009 > New Revision: 40428 > > URL: http://svn.reactos.org/svn/reactos?rev=40428&view=rev > Log: > - Recognize up to 4 partitions inside every primary partition table. However, installation will be performed to the first partition anyway. How is this going to work for GPT disks? I am not quite sure about how the bootcamp emulation does its magic. Logically it seems to me the BSD slice would seem to be the first partition and bootcamp would show up as partition 2. Are we not going to be able to do this? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

Brainstorming about testing team, roadmap and ReactOS usability
by Aleksey Bragin 09 Apr '09

09 Apr '09

Hi, I had a chat with Olaf a few days ago, regarding a few issues, and we thought it would be beneficial to bring them up for collective brainstorming. Background information: In the past and nowadays work in ReactOS is getting done "as it flows". E.g. if we get developers, who wanted to implement sound support, would do it, and we advertise this in a release. Or, like Evgeniy Boltik who shows a nice cooperation with Timo, Jim and Ged on fixing various nasty palette and drawing issues which were not touched for a few years, often fixing errors introduced in revisions like 1000 or 4000. There is no central plan, just a very rough roadmap, mainly relatively short-term. Same applies to testing team: we usually perform testing when an obvious problem occurs, in our very well known apps list, which someone remembers to work in a certain revision. If that's known to regress, Olaf usually organizes a regression-testing, a guilty revision is found, and problem hopefully gets fixed. All of this is very good, for an operating system which is developed just for the sake of development: noone sets any milestones, noone demands to meet them. And noone pays for achieving them either. But when Linux got a real spin-off? An answer is: when it aimed to become useful for the most needed application - as a platform to run a web server and a mail server. http://en.wikipedia.org/wiki/ Linux_adoption says that in 2001 Linux servers experienced 15% annual growth rate, and by 2004 50% of the worldwide blade servers are shipped with Linux-based OS. This was preceded by hard work of a number of people, like Andrew Morton. Who aimed not just at gettign more and more features, but more at getting existing code as stable as it's possible. That included going through all the issues people reported, asking them to provide more info if needed, finding the actual bug, fixing it, asking them to retest... At some point all most frequently encountered bugs were fixed, and potential Linux usage base extended substantially. For ReactOS, we have different aims, but we could use this strategy now, when core parts of our operating system are becoming feature- complete and mostly need debugging, and when we finally are getting very close to going Beta. This involves, first of all, getting hardware support at a decent level. From a billion of personal computers in the world, we could easily support the most common hardware without need to develop complex drivers or different HALs. Even SATA would not really be a strong requirement, since most of PCs have IDE compatibility mode, which many non-technical people even forget to switch to "SATA" mode in the BIOS when installing their Windows OS! Again Linux's philisophy could help us: they are proud that their hardware is Linux- compatible, while we are embarrased that "our OS doesn't support specific hardware". Feel the difference. Some good step in this direction is this wikipage: http:// www.reactos.org/wiki/index.php/Supported_Hardware/Network_cards Next, software. We have a unique situation when our OS targets a vast amount of WinAPI compatible software. There is a lot of bugs in our Win32 subsystem, however if we can find a set of apps we support right now, or find common software which we could easily support - it should be our "road ahead". Now back to what I started writing this email about. I was speaking with Olaf and Klemens about the software compatibility database. Existing "Support Database" is not used by people, and not liked by most of our developers and testers because it takes more time to file an entry into that database than to actually install ReactOS and test the app. Another problem is that community-driven database won't work since we can't confirm people's data. What we thought would work good so far is a list of working apps. As Olaf said: "it'll be ugly, not scientifically statistically fine, crude comparing to wine appdb and limited. Bit it can be done". The amount of text to enter for an app entry must be as minimal as possible: app name, platform (real hardware, emulator), bug number in bugzilla for possible issues (max. 2 bugs for one entry). Also, no division for "installs, but doesn't start" or "works only via manual installation". Either it works, or it doesn't, no intermediate stages. As we thought later, it may even be just three columns: appname, ROS revision, Comments. A wikipage could suit this need, but if necessary, we could think further of some web-app. I think that's enough for one email, I'll be glad to listen to comments and more ideas. Everyone is welcome to take part in the discussion. With the best regards, Aleksey Bragin.

5 8

Re: [ros-dev] Ros-dev Digest, Vol 56, Issue 8
by Olaf Siejka 08 Apr '09

08 Apr '09

I`ll participate in testing team, no matter what shape or methode will be chosen, this is above discussion. The approach should be discussed though. In the years i`ve been with ROS, we had a remarkable increase in stability, from the point when you had to be careful to finish up the planned test, so ReactOS doesnt hang in the process, to the point when you actually have to try hard to crash it. Certainly, we are stilll miles from being rock solid, but the progress has been made. We have one primary problem with our project: too many problems at the same time. Its not only stability (with Mm, Cc and vfat issues) or hardware support (unimplemented PnP and HAL, busted resource reporting), or Win32 subsystem issues Timo has pointed. At the same time we have problems with WINE userland and their approach to implementation, general code untidyness, header mess, miriads of old and often undocumented hacks, on which future assumptions were made, rbuild/compiler issues, lack of decent debugging tools, general lack of manpower in all areas, lack of standarised testing platform as well as problems determining our future goals or attracting more publicity. I think you could add a bunch more. You know what? We try to solve all of those problems at once. And yet we are unable to finish off a single one.

2 1

Re: [ros-dev] [ros-diffs] [gschneider] 40418: - Offset coordinates with viewport origin for gradient filled triangular and rectangular shapes
by Timo Kreuzer 08 Apr '09

08 Apr '09

The DC origin is in device coordinates and should be the last translation. gschneider(a)svn.reactos.org schrieb: > Author: gschneider > Date: Wed Apr 8 20:53:21 2009 > New Revision: 40418 > > URL: http://svn.reactos.org/svn/reactos?rev=40418&view=rev > Log: > - Offset coordinates with viewport origin for gradient filled triangular and rectangular shapes > > Modified: > trunk/reactos/subsystems/win32/win32k/objects/fillshap.c > > Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Apr 8 20:53:21 2009 > @@ -907,6 +907,8 @@ > > DitherOrg.x = dc->ptlDCOrig.x; > DitherOrg.y = dc->ptlDCOrig.y; > + IntLPtoDP(dc, (LPPOINT)&DitherOrg, 1); > + > Extent.left += DitherOrg.x; > Extent.right += DitherOrg.x; > Extent.top += DitherOrg.y; > > >

1 0

Brainstorming about testing team, roadmap and ReactOS usability
by victor martinez 08 Apr '09

08 Apr '09

First of all sorry because i dont have idea how to follow a thread when answering one post. And i didnt find any info about how to do that :) Now about the Topic: Some days ago I made one Wiki Page which ( I hope) could be useful for Testing purposes. It was created just to share suggestions among Devs and Testers about it. Here it´s: http://www.reactos.org/wiki/index.php/Testing_Central The idea is to have a Main Testing page which leads to proper Bugzilla reports, (as an online newspaper which sums up the info in Headers and clicking on them redirects to Full description),also it can help to have info of the same App together so we can track working/no working Apps instead working/no working Bugs(which is Bugzilla Work). To sum up the Wiki page is divided in 3 sections: 1)Testing Apps: In an easy way we can find which Bugs are preventing the Apps working, and easily redirect to the Bugzilla reports. I think this is (almost) Aleksey proposal. The table has the following Cols: Tester Name, App Name,Revision,4 columns for the 3 VM+RH, Bug Installing,Bug Working. 2)Developer Request: This is a Post-it Table. Here any Dev can write any request (related with testing),so it creates a small TODO list for Testers. Of course it can link to other Wikipages. (i.e : Aicom request about testing Network cards fits here) I have seen a lot of Dev requests in Bugzilla (i.e: "please test this TestBox", or "please test more Apps which uses Pipes", etc...), there isnt any search option to find these requests in Bugzilla, so this Table could track them. The table has the following Cols: DEV,Request,Application/TestBox,Way of Testing,Tester, LRT (Last Revision Tested),RESULT 3)Regression Testing: When a Regression is found a Regression Search begins, or maybe not..because the Tester/Dev doesnt have time enough to begin with it. To avoid losing this info the Regression Testing Table is created, you can fill it with a Regression you have found and other testers can work in it. But the main objective is to Coordinate efforts among Testers, so in Real Time Testers who are performing a regression test doesnt waste time: Testers can see which Revisions are being tested and which is the current Gap so they can guess which is the best revision to test. Also if one Regression Search (by any chance or missing builds ;) ) was left without finding the guilty revision,we will have a GAP for future testing. The table has the following Cols: Name,Regression,4 columns for the 3 VM+RH,Works Rev,Fails Rev,Current Testing. Any comments,suggestions,or criticisms are wellcome. For a full detailed description visit the Wiki page :)..it´s just a prototype and of course un-official. Víctor Martínez Calvo vicmarcal _________________________________________________________________ El nuevo Windows Live te une a los que más quieres http://www.windowslive.es

1 0

Different repository for web stuff
by Aleksey Bragin 07 Apr '09

07 Apr '09

Hi, how about using a different repository for all web-specific stuff we have? Vendor drops of web apps, whole trunk/web, etc. All of these are totally unrelated (in terms of repository-internal relations) with the actual OS components. Current situation went from long time ago when there was only one repository possible. It's been a long time since we migrated to svn:// svn.reactos.org/repostiory/... path, so it's possible now. rosweb, or web could be a name for a new one. Comments are welcome. WBR, Aleksey Bragin.

7 14

Re: [ros-dev] Different repository for web stuff
by WaxDragon 06 Apr '09

06 Apr '09

+1 I'd like to see all the non-OS stuff put in a separate repository, including the promotional stuff in /media. WD On Apr 6, 2009 11:36 AM, "Aleksey Bragin" <aleksey(a)reactos.org> wrote: Hi, how about using a different repository for all web-specific stuff we have? Vendor drops of web apps, whole trunk/web, etc. All of these are totally unrelated (in terms of repository-internal relations) with the actual OS components. Current situation went from long time ago when there was only one repository possible. It's been a long time since we migrated to svn:// svn.reactos.org/repostiory/... path, so it's possible now. rosweb, or web could be a name for a new one. Comments are welcome. WBR, Aleksey Bragin. _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

1 0

Re: [ros-dev] [ros-diffs] [fireball] 40368: - Compile UniATA with stdcall default calling convention instead of cdecl.
by Alex Ionescu 05 Apr '09

05 Apr '09

Please don't do this. -MRTD has NOTHING to do with stdcall and has been broken since gcc 2.9.5 Best regards, Alex Ionescu On Sun, Apr 5, 2009 at 7:46 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Sun Apr 5 15:46:53 2009 > New Revision: 40368 > > URL: http://svn.reactos.org/svn/reactos?rev=40368&view=rev > Log: > - Compile UniATA with stdcall default calling convention instead of cdecl. > > Modified: > trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild > > Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… > > ============================================================================== > --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] > (original) > +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Sun > Apr 5 15:46:53 2009 > @@ -4,6 +4,7 @@ > <bootstrap installbase="$(CDOUTPUT)" /> > <include base="uniata">.</include> > <include base="uniata">inc</include> > + <compilerflag>-mrtd</compilerflag> >  > <library>ntoskrnl</library> > <library>hal</library> > >

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 40306: win32k brush update: - fix EBRUSHOBJ_vSetSolidBrushColor - Initialize text and background brush in DC_AllocDC - Update the DCs EBRUSHOBJs on demand - Use the DCs EBRUSHOBJs for drawing where appropriate This makes things faster and finally adds support for DC_BRUSH and DC_PEN
by Aleksey Bragin 05 Apr '09

05 Apr '09

Evgeniy Boltik complains that EBRUSHOBJ_vInit is necessary because it has something to do with changing brush color or palette. He's going to file a bug about it in BZ. WBR, Aleksey Bragin. On Apr 1, 2009, at 5:49 AM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Wed Apr 1 05:49:18 2009 > New Revision: 40306 > > URL: http://svn.reactos.org/svn/reactos?rev=40306&view=rev > Log: > win32k brush update: > - fix EBRUSHOBJ_vSetSolidBrushColor > - Initialize text and background brush in DC_AllocDC > - Update the DCs EBRUSHOBJs on demand > - Use the DCs EBRUSHOBJs for drawing where appropriate > This makes things faster and finally adds support for DC_BRUSH and > DC_PEN > > - EBRUSHOBJ_vInit(&dc->eboLine, pbrushPen, dc->rosdc.XlatePen); > - > - EBRUSHOBJ_vInit(&BrushInst, pbrush, DCDest- > >rosdc.XlateBrush);

1 0

Re: [ros-dev] [ros-diffs] [fireball] 40363: Evgeniy Boltik <bstsoft@narod.ru> - Enable and use mask support in UserDrawIconEx, fully compatible with Windows, based on tests in bug 4336. - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer required due to fix in CreateCompatibleDC. - Change a few comments in the code of UserDrawIconEx. See issue #4336 for more details.
by Aleksey Bragin 04 Apr '09

04 Apr '09

That was from bug 4294, and test app was in bug 4294 too. WBR, Aleksey Bragin. On Apr 4, 2009, at 10:52 PM, fireball(a)svn.reactos.org wrote: > Author: fireball > Date: Sat Apr 4 22:52:14 2009 > New Revision: 40363 > > URL: http://svn.reactos.org/svn/reactos?rev=40363&view=rev > Log: > Evgeniy Boltik <bstsoft(a)narod.ru> > - Enable and use mask support in UserDrawIconEx, fully compatible > with Windows, based on tests in bug 4336. > - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer > required due to fix in CreateCompatibleDC. > - Change a few comments in the code of UserDrawIconEx. > See issue #4336 for more details.

1 0

Partitions support in usetup
by Aleksey Bragin 02 Apr '09

02 Apr '09

Hi, I researched my partition problem (in my hardware setup, I have an IDE harddisk, which has 3 primary partitions, and I don't want to use the first partittion), and sharing my findings. So far, kernel and drivers have all necessary support and the problem is in usetup directly. Right now, it stores information about partition tables in a linked list of PARTENTRY structures, and displays ONLY the information about the first out of 4 possible partititions in that entry. I checked with Windows 2003 installation CD, it showed me all my partitions as they are, without limiting me anyhow. And certainly it allows installation on any of those partitions. Anyone volunteers to fix this problem properly? WBR, Aleksey Bragin.

3 2

Google Summer of Code
by Aleksey Bragin 02 Apr '09

02 Apr '09

Hi, I'd like to let you know our application has not been accepted into Google Summer of Code, for the third time in a row. I attached an (autogenerated) reply, which encourages us to reapply for future instances of the program. I would not find a better way to express sarcasm than asking us to reapply in future. Amongst accepted organizations there are: WinLibre - a distribution of opensource software for Windows platform. Battle for Wesnoth - a free turn based strategy game. Umit - a frontend for a network scanner (one of their GSoC ideas is to create a "Umit Assistant" which would look like a Clippit - the animated assistant that features Microsoft Office). TurboGears - a web framework written in Python. Thousand Parsec - a bunch of games based on a common framework for building turn based space empire building games. Systers: Woman in computing - a community of women in computing. For some strange reason the founding person is "Robin". Singularity Institute for Artificial Intelligence - non-profit org founded to develop safe artificial intelligence software and to raise awareness of dangers of AI technologies. I just stated a few examples. I highly value those projects, however I just can't understand that yet another framework in python, or a game engine for a turnbased strategies, or a collection of FOSS software for Windows with a package manager (which we already have, and which could have been improved), or an institution which believes that AI takes over the world and tries to stop that are way more important than supporting an organization whose product would be of use for millions of people, and would create a real alternative operating system compatible with the vast majority of existing software and hardware. Our friendly OS project Haiku gets accepted every year, so being an OS is not a problem. Wine is certainly accepted every year from the beginning, and this year is not an exception. So it's definately not a problem of "legal fear" of Microsoft. What is the problem then? I leave it to you to decide what's the problem. However, as for me, I see Google Summer of Code is nothing close to supporting free software world, but rather an expensive way of advertising. I want to hope I am wrong. With the best regards, Aleksey Bragin ReactOS Foundation President. ---------- Forwarded message ---------- From: <socghop.noreply(a)gmail.com> Date: Thu, Mar 19, 2009 at 12:48 AM Subject: Thank you for your application To: xxx(a)reactos.org Hi Aleksey Bragin, Thank you for submitting "ReactOS" organization application to Google Summer of Code 2009. Unfortunately, we were unable to accept your organization's application at this time. We received many more applications for the program than we are able to accommodate, and we would encourage you to reapply for future instances of the program. Best regards, Google Open Source Programs

7 10

Re: [ros-dev] [ros-diffs] [jimtabor] 40305: - Implement NtUserProcessConnect. Moving to client information format for User32. PPROCESSINFO and PTHREADINFO are references not user land structures. - Added and removed structure types. - Tested with old
by James Tabor 02 Apr '09

02 Apr '09

Hi! Fixed in 40308! Thanks, James On Tue, Mar 31, 2009 at 8:59 PM, Timo Kreuzer <timo.kreuzer(a)web.de> wrote: > These are already in win32k/include/desktop.h >

1 0

debug builds
by Gabriel ilardi 01 Apr '09

01 Apr '09

Hi everyone, Lately I wanted to use latest debug builds to do some testing but they weren't yet available, can't we upload them before doing the tests? This way they'd be ready sooner for us to use... Regards, Gabriel. _________________________________________________________________ Quante ne sai? Scoprilo con CrossWire! http://clk.atdmt.com/GBL/go/140630367/direct/01/

1 0

Re: [ros-dev] [ros-diffs] [jimtabor] 40305: - Implement NtUserProcessConnect. Moving to client information format for User32. PPROCESSINFO and PTHREADINFO are references not user land structures. - Added and removed structure types. - Tested with old AbiWord, FireFox and explorer.
by Timo Kreuzer 01 Apr '09

01 Apr '09

These are already in win32k/include/desktop.h jimtabor(a)svn.reactos.org schrieb: > /* PRIVATE FUNCTIONS **********************************************************/ > + > +PVOID > +FASTCALL > +DesktopAlloc(PDESKTOP DesktopObject, SIZE_T Size) > +{ > + return RtlAllocateHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, Size); > +} > + > +BOOL > +FASTCALL > +DesktopFree(PDESKTOP DesktopObject, PVOID HeapBase) > +{ > + return RtlFreeHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, HeapBase); > +} > >

1 0

Wine syncing process
by Aleksey Bragin 31 Mar '09

31 Mar '09

Hello, I'd like to improve the existing situation we have with Wine syncing. Right now, we have a group of people, occasionally doing Wine syncs, and that group of people included me some time ago too. However, date was never really specified, and syncing happens "when someone wants to sync", "before releasing", or when something is fixed in Wine and we import that code. How it should happen (in my opinion). All non-forked DLLs, tools and programs must be synced after each Wine minor release. This is going to be manual process, so we need a person to organize this process, and a few people who could participate in doing actual work (syncers). What this "team" leader / responsible person should do: * Share the work (modules) between syncers. * Leave hard-to-sync modules to experienced developers and himself. * Ensure all syncers are instructed to do basic testing (running our "golden" list of apps - FireFox, AbiWord, mIRC, and testing ole32/ rpcrt4/widl with a real app which uses OLE mechanism) before committing the work. * Be aware about syncing dependencies (e.g. when syncing widl, it makes sense to sync rpcrt4 simulteneously) * Be aware about problematic syncs (like icmp.dll sync, which possibly introduces memory corruption, and which is still not fixed in Wine). * Keep a log of what has been synced, what has not, keep a note of all problems. If that proves to work good, this team may be officially announced as "wine syncing team". There are already at least two successfully working teams this way: Bugzilla maintaining (with Amine being the maintainer, and my point of contact when I want to complain or ask about something), and Testing team (with Olaf being often my point of contact, and organizing and doing all the hard work of regress testing, testing apps, drivers, real hardware testing and getting results submitted). Also, I think those two teams cooperate the best. I wish we could expand this idea to the Wine syncing team, and get it to work that smoothly too, and that cooperative too. With the best regards, Aleksey Bragin.

5 6

Re: [ros-dev] [ros-diffs] [jmorlan] 40289: Make cmd able to (sort of) work without a console.
by Steven Edwards 30 Mar '09

30 Mar '09

Hi! 2009/3/29 <jmorlan(a)svn.reactos.org>: > Author: jmorlan > Date: Sun Mar 29 23:17:45 2009 > New Revision: 40289 > > URL: http://svn.reactos.org/svn/reactos?rev=40289&view=rev > Log: > Make cmd able to (sort of) work without a console. Thanks! I am now able to run telnetd and connect in to my ReactOS VM. Certain applications such as ctm don't seem to like running without a console due to making calls to GetConsoleMode. I am going to test telnetd on Windows with Windows cmd.exe and ReactOS cmd.exe to compare behavior of these applications. Its possible cmd.exe returns some bogus console mode or something when running without a console. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 2

examiner.com spam
by Aleksey Bragin 30 Mar '09

30 Mar '09

I unsubscribed email feedback(a)examiner.com, since it sends out everyone an email "thank you for your feedback". Sorry for inconvinience... People should think more when subscribing with such stupid autorepliers. WBR, Aleksey Bragin.

1 0

R40285
by Dmitry Gorbachev 30 Mar '09

30 Mar '09

Hi! Aleksey Bragin wrote: > Now each line of a debug log is printed synchronously DPRINT and DPRINT1 still call DbgPrint twice...

2 1

Re: [ros-dev] [ros-diffs] [jmorlan] 40280: Make command parsing in DoCommand/Execute more compatible with Windows
by Steven Edwards 29 Mar '09

29 Mar '09

Hi! On Sun, Mar 29, 2009 at 1:13 AM, <jmorlan(a)svn.reactos.org> wrote: > Author: jmorlan > Date: Sun Mar 29 09:13:35 2009 > New Revision: 40280 Would you mind taking a look at a cmd.exe bug Wax found? (I can't log in to bugzilla to file a bug report but I can quickly describe the issue) For some reason the CreateProcess call in in telnetd that spawns cmd.exe causes it to generate the error INVALID_HANDLE_VALUE. This issue does not happen with ReactOS telnetd on windows if you use Windows cmd.exe or if you use another console application on ReactOS such as ping.exe so we have isolated it to a cmd.exe problem. Telnetd is located in rosapps/sysutils/applications/telnetd Thanks! -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Where is MMVAD struct?
by Jun Koi 28 Mar '09

28 Mar '09

Hi, I searched for everywhere in the source code to see the definition of the MMVAD struct, but it is nowhere. So I suppose that we have something else (with different name) for that? If so, where is it? Thanks, Jun

4 4

rosapps
by Dmitry Chapyshev 27 Mar '09

27 Mar '09

Hi. I suggest to divide rosapps on two parts: 1) Components which are present in Windows (rosapps) 2) 3rd party components (3rdapps) In rosapps it is necessary to place all components without which the system can normally work (calc, hh, winhlp32, charmap, games and etc) In 3rdapps components which are not present in Windows (downloader, imagesoft and etc) will take places Such placing of components will allow to reduce compilation time as you can not compile not the modules necessary to you (rosapps and/or 3rdapps) Please tell your opinion on my proposition. -- WBR, Dmitry Chapyshev

15 32

Re : Re : Where is MMVAD struct?
by Sylvain Petreolle 27 Mar '09

27 Mar '09

Are you all receiving this automated reply when sending mail to ros-dev ML ? Kind regards, Sylvain Petreolle ________________________________ De : feedback(a)teamexaminer.com À : spetreolle(a)yahoo.fr Envoyé le : Vendredi, 27 Mars 2009, 11h20mn 09s Objet : RE: [ros-dev] Re : Where is MMVAD struct? Thank you for your feedback. Your email will be reviewed and processed accordingly. Sincerely, Examiner.com

1 0

Recent changes
by Colin Finck 26 Mar '09

26 Mar '09

Hello everybody, As you might have noticed, I recently did some changes to our Website stuff and Regression Testing System. Finally, it's time to show some results now: == BuildBot upgrade == Christoph reinstalled the latest version of BuildBot on our Swedish server today, since the previous server system was way too old for such an upgrade. This also had the uncomfortable side-effect of the BuildBot URL changing from http://reactos.org:8010 to http://build.reactos.org:8010, which most of you already seem to have noticed ;-) Sorry for not giving a note about this before. I thought I could just finish my stuff and then write this E-Mail explaining all changes, but as always, it took longer than expected :-/ == Crash Recovery in rosautotest and sysreg2 == In the recent days, I rewrote rosautotest in C++ for getting a more maintainable code. This update also added a Crash Recovery feature. Together with my updated version of sysreg2, we can now resume the testing process with the next test in case a specific test made ReactOS crash. == Web Test Interface == As we recently set up a new VM, which will eventually replace our current outdated www.reactos.org server, I finally had a playground for my third component of our testing system: The "testman" Web Interface. It is available at http://79.99.5.181/testman/ Features include finding specific test results through a getbuilds-like interface and comparing them. The Comparison feature can compare up to 5 results side-by-side and show the differences. Clicking on "Show only changed results" will only show the lines that have differences. You can also use Drag & Drop to move the column headers with all associated results to get the table to look like you want it. Clicking a test result will show details, including a log of this specific test. Just play around with it a bit and you should easily get to know about all features. Regarding Lone_Rifle's interface at http://reactos.nxserve.net: From what he told me, this one was only meant as a decentral alternative as long as we don't have "testman" on an official server. I'm saying this, so nobody gets the impression that I just wanted to extinguish his work with my implementation. If some people prefer Lone_Rifle's version over mine, it would just need to be adjusted to the new BuildBot URL and those people could still use it. Comments and suggestions are welcome of course. Not everything works perfect yet (e.g. the Debug Buildslave needs quite some time now as all tests are run), but it should be ready for you to try now. Best regards, Colin

5 8

Buildbot page moved..
by Timo Kreuzer 25 Mar '09

25 Mar '09

Hi, Since today, I cannot access the old buildbot page (http://reactos.org:8010/) anymore. I found the new URL (http://build.reactos.org:8010) in Colin's commit message. Was this an intentional change? I am asking because noone announced this change and some people might now wonder where the buildbot page is... Or am I the only one accessing it via my favourites? Is there even a link from the website (I couldn't find one)? Ah... and the old page had an icon, the new one doesn't. Timo PS: The nice regtest pages at http://reactos.nxserve.net also don't work anymore. They were very useful and I'd like to see them up again. So a) do we have something like that for our website (or in work)? Or b) can this one be fixed? (I forgot who owns it.)

5 5

Re: [ros-dev] [ros-diffs] [dgorbachev] 40181: Add "REACTOS Mm Hack of Doom" again (removed in r39723). Bug #4296.
by Matthieu Suiche 24 Mar '09

24 Mar '09

In a previous message you said: >Alex Ionescu wrote: >> This new hack directly slows down every context switch instead of every >> page fault -- the latter is a less important perf hit. > >This slowdown is very small, especially when comparing with other >"Hack of Doom". >I just want to see, is it the only raison d'être of that old hack or not. Could you explain the reason you add Mm Hack of Doom again if the slowdown is very small? Regards, -- Matthieu Suiche On Mon, Mar 23, 2009 at 1:56 AM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Mon Mar 23 03:56:01 2009 > New Revision: 40181 > > URL: http://svn.reactos.org/svn/reactos?rev=40181&view=rev > Log: > Add "REACTOS Mm Hack of Doom" again (removed in r39723). Bug #4296. > > Modified: > trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S > trunk/reactos/ntoskrnl/ke/i386/trap.s > > Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Mar 23 03:56:01 2009 > @@ -389,9 +389,6 @@ > > /* Checking NPX, disable interrupts now */ > mov eax, [esi+KTHREAD_INITIAL_STACK] > - > - /* HACK */ > - mov ecx, [eax - 4] > cli > > /* Get the NPX State */ > > Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Mar 23 03:56:01 2009 > @@ -1924,10 +1924,14 @@ > NoFixUp: > mov edi, cr2 > > + /* REACTOS Mm Hack of Doom */ > + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK > + je HandlePf > + > /* Enable interrupts and check if we got here with interrupts disabled */ > sti > - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK > - jz IllegalState > + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK > + jz IllegalState */ > > HandlePf: > /* Send trap frame and check if this is kernel-mode or usermode */ > >

2 1

Guidance
by മഹേഷ് മുകുന്ദന് | Mahesh M 24 Mar '09

24 Mar '09

Hi, I am doing a project on implementing VFS. Can anyone help me as a mentor? Since I'm more used to in Linux than in ROS code, it would be a great help if someone can help me through. I have gone through the ntos folder and read some documents and also the winvfs project that someone here suggested. I'm aware this is not a prime target in the ROS team, but once I complete this, I might be able to contribute to areas of higher priority. Hoping for a positive reply, Thank you. -- Mahesh M Happy hacking... , , / \ ((__-^^-,-^^-__)) `-_---' `---_-' `--|o` 'o|--' \ ` / ): :( :o_o: "-"

1 0

Re: [ros-dev] [ros-diffs] [mkupfer] 40173: - Disable "Back" in last page of syssetup, because it doesn't make any sense.
by Gabriel ilardi 22 Mar '09

22 Mar '09

This hides bug 2675. > Date: Sun, 22 Mar 2009 16:36:17 +0000 > To: ros-diffs(a)reactos.org > From: mkupfer(a)svn.reactos.org > Subject: [ros-diffs] [mkupfer] 40173: - Disable "Back" in last page of syssetup, because it doesn't make any sense. > > Author: mkupfer > Date: Sun Mar 22 19:36:16 2009 > New Revision: 40173 > > URL: http://svn.reactos.org/svn/reactos?rev=40173&view=rev > Log: > - Disable "Back" in last page of syssetup, because it doesn't make any sense. > > Modified: > trunk/reactos/dll/win32/syssetup/wizard.c > > Modified: trunk/reactos/dll/win32/syssetup/wizard.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… > ============================================================================== > --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Mar 22 19:36:16 2009 > @@ -1990,22 +1990,13 @@ > { > case PSN_SETACTIVE: > /* Enable the correct buttons on for the active page */ > - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); > + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); > > SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, > MAKELPARAM(0, 300)); > SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); > SetTimer(hwndDlg, 1, 50, NULL); > break; > - > - case PSN_WIZBACK: > - /* Handle a Back button click, if necessary */ > - KillTimer(hwndDlg, 1); > - > - /* Skip the progress page */ > - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); > - SetupData.UnattendSetup = FALSE; > - return TRUE; > > case PSN_WIZFINISH: > /* Handle a Finish button click, if necessary */ > _________________________________________________________________ Scopri le keyword più cercate della settimana! http://clk.atdmt.com/GBL/go/136430524/direct/01/

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 40142: - Reorganize NDIS code
by Aleksey Bragin 21 Mar '09

21 Mar '09

What was wrong with a previous naming convention? x0gone.c were supposed to contain implementation of functions, which became legacy in that major version of NDIS. Now you substituted it with x0stubs.c, which means it's going to contain stubs only. Was that intentionally? On Mar 21, 2009, at 12:29 AM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Sat Mar 21 00:29:53 2009 > New Revision: 40142 > > URL: http://svn.reactos.org/svn/reactos?rev=40142&view=rev > Log: > - Reorganize NDIS code > > Added: > trunk/reactos/drivers/network/ndis/ndis/30stubs.c > - copied, changed from r40140, trunk/reactos/drivers/network/ > ndis/ndis/40gone.c > trunk/reactos/drivers/network/ndis/ndis/40stubs.c > - copied, changed from r40141, trunk/reactos/drivers/network/ > ndis/ndis/50gone.c > trunk/reactos/drivers/network/ndis/ndis/50stubs.c > - copied, changed from r40113, trunk/reactos/drivers/network/ > ndis/ndis/stubs.c > trunk/reactos/drivers/network/ndis/ndis/misc.c (with props) > Removed: > trunk/reactos/drivers/network/ndis/ndis/40gone.c > trunk/reactos/drivers/network/ndis/ndis/50gone.c > trunk/reactos/drivers/network/ndis/ndis/stubs.c

2 1

advapi self forwarding and kernel32 self imports
by Timo Kreuzer 21 Mar '09

21 Mar '09

Hi, 1.) Is there a reason, why some exports of advapi32 are forwarded instead of just set to the proper function? Forwarding is more work for the loader. 2.) kernel32 imports from itself. Which will probably lead to the same result as bug 4292. This is because the mingw lib imports from kernel32 and requires kernel32 library to be added afterwards. But rbuild likes to add mingw lib at the very end of the library list which requires adding kernel32 as a library to mingw_common to resolve imports. This should be fixed and mingw added as the very first library. I wonder if those 2 are even allowed on Windows, as both don't make sense. Timo

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 40115: rename DCs pDc_Attr to pdcattr, like in gdikdx. Make pdcattr alsways point to a DC_ATTR, either the user mode struct or the local part. Get rid of all the If (!pdcattr) pdcattr = &dc->Dc_Attr; That are not
by James Tabor 20 Mar '09

20 Mar '09

Hi All! Good to see it go, I had it in as a safeguard, and now we moved on to the next phase of the rewrite! Thanks Timo! James 8^D On Fri, Mar 20, 2009 at 4:47 AM, Aleksey Bragin <aleksey(a)reactos.org> wrote: > Oh, finally! ;) > > On Mar 20, 2009, at 7:51 AM, tkreuzer(a)svn.reactos.org wrote: > >> Author: tkreuzer >> Date: Fri Mar 20 07:51:26 2009 >> New Revision: 40115 >> >> URL: http://svn.reactos.org/svn/reactos?rev=40115&view=rev >> Log: >> rename DCs pDc_Attr to pdcattr, like in gdikdx. >> Make pdcattr alsways point to a DC_ATTR, either the user mode >> struct or the local part. Get rid of all the If (!pdcattr) pdcattr >> = &dc->Dc_Attr; That are not required anymore. >

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 40115: rename DCs pDc_Attr to pdcattr, like in gdikdx. Make pdcattr alsways point to a DC_ATTR, either the user mode struct or the local part. Get rid of all the If (!pdcattr) pdcattr = &dc->Dc_Attr; That are not required anymore.
by Aleksey Bragin 20 Mar '09

20 Mar '09

Oh, finally! ;) On Mar 20, 2009, at 7:51 AM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Fri Mar 20 07:51:26 2009 > New Revision: 40115 > > URL: http://svn.reactos.org/svn/reactos?rev=40115&view=rev > Log: > rename DCs pDc_Attr to pdcattr, like in gdikdx. > Make pdcattr alsways point to a DC_ATTR, either the user mode > struct or the local part. Get rid of all the If (!pdcattr) pdcattr > = &dc->Dc_Attr; That are not required anymore.

1 0

[ros-diffs] [fireball] 40106: - Don't try to be smarter than Windows and don't copy background/foreground color from the original DC.
by James Tabor 20 Mar '09

20 Mar '09

Introduced in revision 6042. Over think was a norm back then.

1 0

header hack.... eeh workaround ;)
by Timo Kreuzer 17 Mar '09

17 Mar '09

Hi, I's like to suggest a workaround to the problem that we have to deal with both RECT and RECTL structures in win32k and as they are incompatible need to typecast in a lot of places. RECTL is what the DDI interface uses (almost) exclusively. While the NtGdi Interface and a lot of User structures also use RECT. Both structures are equal, but not compatible when it comes to assigning one to another, So we need to do all these nasty typecasts. My suggestion is adding some defines after the inclusion of windef.h: #define RECT RECTL #define PRECT PRECTL #define LPRECT LPRECTL #define LPCRECT LPCRECTL same for POINT and POINTL I'd like to hear your opinion on that. Thanks, Timo

2 2

Re: [ros-dev] [ros-diffs] [dgorbachev] 40014: Trying to fix boot breakage.
by Timo Kreuzer 14 Mar '09

14 Mar '09

dgorbachev(a)svn.reactos.org schrieb: > Author: dgorbachev > Date: Sat Mar 14 21:13:32 2009 > New Revision: 40014 > > URL: http://svn.reactos.org/svn/reactos?rev=40014&view=rev > Log: > Trying to fix boot breakage. > Try harder, please ;-P http://reactos.org:8010/builders/ReactOS_%28Debug%29/builds/13888/steps/tes… > Modified: > trunk/reactos/ntoskrnl/mm/freelist.c > trunk/reactos/ntoskrnl/mm/kmap.c > > Modified: trunk/reactos/ntoskrnl/mm/freelist.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Mar 14 21:13:32 2009 > @@ -942,6 +942,21 @@ > return NumberOfPagesFound; > } > > +static > +NTSTATUS > +MiZeroPageInternal(PFN_TYPE Page) > +{ > + PVOID TempAddress; > + > + TempAddress = MiMapPageToZeroInHyperSpace(Page); > + if (TempAddress == NULL) > + { > + return(STATUS_NO_MEMORY); > + } > + memset(TempAddress, 0, PAGE_SIZE); > + return(STATUS_SUCCESS); > +} > + > NTSTATUS > NTAPI > MmZeroPageThreadMain(PVOID Ignored) > @@ -989,7 +1004,7 @@ > PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; > KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); > Pfn = PageDescriptor - MmPageArray; > - Status = MiZeroPage(Pfn); > + Status = MiZeroPageInternal(Pfn); > > oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); > if (PageDescriptor->MapCount != 0) > > Modified: trunk/reactos/ntoskrnl/mm/kmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=400… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Sat Mar 14 21:13:32 2009 > @@ -16,18 +16,23 @@ > /* GLOBALS *****************************************************************/ > > /* FUNCTIONS ***************************************************************/ > + > NTSTATUS > NTAPI > MiZeroPage(PFN_TYPE Page) > { > + PEPROCESS Process; > + KIRQL Irql; > PVOID TempAddress; > > - TempAddress = MiMapPageToZeroInHyperSpace(Page); > + Process = (PEPROCESS)KeGetCurrentThread()->ApcState.Process; > + TempAddress = MiMapPageInHyperSpace(Process, Page, &Irql); > if (TempAddress == NULL) > { > return(STATUS_NO_MEMORY); > } > memset(TempAddress, 0, PAGE_SIZE); > + MiUnmapPageInHyperSpace(Process, TempAddress, Irql); > return(STATUS_SUCCESS); > } > > > >

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 40008: Return to an old idea of MiMapPageToZeroInHyperSpace(), "fix" bug #4267.
by Timo Kreuzer 14 Mar '09

14 Mar '09

This breaks boot. http://reactos.org:8010/builders/ReactOS_%28Debug%29/builds/13880/steps/tes… dgorbachev(a)svn.reactos.org schrieb: > Author: dgorbachev > Date: Sat Mar 14 04:20:18 2009 > New Revision: 40008 > > URL: http://svn.reactos.org/svn/reactos?rev=40008&view=rev > Log: > Return to an old idea of MiMapPageToZeroInHyperSpace(), "fix" bug #4267. > > Modified: > trunk/reactos/ntoskrnl/mm/hypermap.c > > Modified: trunk/reactos/ntoskrnl/mm/hypermap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sat Mar 14 04:20:18 2009 > @@ -14,8 +14,11 @@ > > /* GLOBALS ********************************************************************/ > > +#define MI_ZEROING_PTES 255 > + > PMMPTE MmFirstReservedMappingPte; > PMMPTE MmLastReservedMappingPte; > +PMMPTE MmFirstReservedZeroingPte; > MMPTE HyperTemplatePte; > PEPROCESS HyperProcess; > KIRQL HyperIrql; > @@ -40,6 +43,8 @@ > MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); > MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); > MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; > + MmFirstReservedZeroingPte = MiAddressToPte(MI_ZERO_PTE); > + MmFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZEROING_PTES; > } > > PVOID > @@ -134,38 +139,62 @@ > { > MMPTE TempPte; > PMMPTE PointerPte; > + PFN_NUMBER Offset; > PVOID Address; > - > + > // > // Never accept page 0 > // > ASSERT(Page != 0); > - > + > // > // Build the PTE > // > TempPte = HyperTemplatePte; > TempPte.u.Hard.PageFrameNumber = Page; > - > - // > - // Get the Zero PTE and its address > - // > - PointerPte = MiAddressToPte(MI_ZERO_PTE); > + > + // > + // Pick the first zeroing PTE > + // > + PointerPte = MmFirstReservedZeroingPte; > + > + // > + // Now get the first free PTE > + // > + Offset = PFN_FROM_PTE(PointerPte); > + if (!Offset) > + { > + // > + // Reset the PTEs > + // > + Offset = MI_ZEROING_PTES; > + KeFlushProcessTb(); > + } > + > + // > + // Prepare the next PTE > + // > + PointerPte->u.Hard.PageFrameNumber = Offset - 1; > + > + // > + // Write the current PTE > + // > + PointerPte += Offset; > + *PointerPte = TempPte; > + > + // > + // Return the address > + // > Address = (PVOID)((ULONG_PTR)PointerPte << 10); > - > - // > - // Invalidate the old address > - // > - __invlpg(Address); > - > - // > - // Write the current PTE > - // > - TempPte.u.Hard.PageFrameNumber = Page; > - *PointerPte = TempPte; > - > - // > - // Return the address > - // > return Address; > } > + > +VOID > +NTAPI > +MiUnmapPageInZeroSpace(IN PVOID Address) > +{ > + // > + // Blow away the mapping > + // > + MiAddressToPte(Address)->u.Long = 0; > +} > > >

1 0

Re: [ros-dev] [ros-diffs] [mkupfer] 39871: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details.
by Ged 13 Mar '09

13 Mar '09

Looking at the patch only this looks wrong to me. Assuming this is radio button it should use the marlett font. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 04 March 2009 16:30 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39871: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details. Author: mkupfer Date: Wed Mar 4 19:29:57 2009 New Revision: 39871 URL: http://svn.reactos.org/svn/reactos?rev=39871&view=rev Log: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Mar 4 19:29:57 2009 @@ -1276,11 +1276,12 @@ yc = myr.top + SmallDiam - SmallDiam/2; i = 234*SmallDiam/750; i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; + myr.left = xc - i/2; myr.right = xc + i/2; - myr.top = yc - i+i/2; + myr.top = yc - i/2; myr.bottom = yc + i/2; - Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye); + // if the start and the end point are equal, Pie() only draws a single line, so start one pixel lower + Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye+1, xe, ye); break; case DFCS_MENUCHECK:

4 3

Re: [ros-dev] [ros-diffs] [mkupfer] 39997: - Add a hackfix comment for issue #4243 due to several requests.
by Ged 13 Mar '09

13 Mar '09

It's not UserDrawIconEx which is hacky, it's just the code you added for detecting alpha pixels Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 13 March 2009 00:21 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39997: - Add a hackfix comment for issue #4243 due to several requests. Author: mkupfer Date: Fri Mar 13 03:20:48 2009 New Revision: 39997 URL: http://svn.reactos.org/svn/reactos?rev=39997&view=rev Log: - Add a hackfix comment for issue #4243 due to several requests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 13 03:20:48 2009 @@ -1389,6 +1389,7 @@ } +/* FIXME: ReactOS specific hack */ BOOL UserDrawIconEx( HDC hDc,

1 0

Re: [ros-dev] [ros-diffs] [mkupfer] 39989: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details.
by Ged 13 Mar '09

13 Mar '09

This looks hacky -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 12 March 2009 21:26 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39989: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details. Author: mkupfer Date: Fri Mar 13 00:25:49 2009 New Revision: 39989 URL: http://svn.reactos.org/svn/reactos?rev=39989&view=rev Log: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 13 00:25:49 2009 @@ -1389,82 +1389,6 @@ } -#define STRETCH_CAN_SRCCOPY_ONLY - -#ifdef STRETCH_CAN_SRCCOPY_ONLY -void -FASTCALL -DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest, - HDC DcSrc, int XSrc, int YSrc, int WidthSrc, int HeightSrc, - DWORD Rop3, BOOL Color) -{ - HDC DcStretched; - HBITMAP BitmapStretched; - HBITMAP OldBitmap; - - if (WidthDest == WidthSrc && HeightDest == HeightSrc) - { - NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, Rop3, 0, 0); - } - else if (SRCCOPY == Rop3) - { - NtGdiStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, - Rop3, 0); - } - else - { - DcStretched = NtGdiCreateCompatibleDC(DcSrc); - if (NULL == DcStretched) - { - DPRINT1("Failed to create compatible DC\n"); - return; - } - if (Color) - { - BitmapStretched = NtGdiCreateCompatibleBitmap(DcDest, WidthDest, - HeightDest); - } - else - { - BitmapStretched = IntGdiCreateBitmap(WidthDest, HeightDest, 1, 1, NULL); - } - if (NULL == BitmapStretched) - { - NtGdiDeleteObjectApp(DcStretched); - DPRINT1("Failed to create temporary bitmap\n"); - return; - } - OldBitmap = NtGdiSelectBitmap(DcStretched, BitmapStretched); - if (NULL == OldBitmap) - { - NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteObjectApp(DcStretched); - DPRINT1("Failed to create temporary bitmap\n"); - return; - } - if (! NtGdiStretchBlt(DcStretched, 0, 0, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, - SRCCOPY, 0) || - ! NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcStretched, 0, 0, Rop3, 0, 0)) - { - DPRINT1("Failed to blt\n"); - } - NtGdiSelectBitmap(DcStretched, OldBitmap); - NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteObjectApp(DcStretched); - } -} -#else -#define DoStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, \ - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, Rop3, Color) \ - NtGdiStretchBlt((DcDest), (XDest), (YDest), (WidthDest), (HeightDest), \ - (DcSrc), (XSrc), (YSrc), (WidthSrc), (HeightSrc), \ - (Rop3), 0) -#endif /* STRETCH_CAN_SRCCOPY_ONLY */ - BOOL UserDrawIconEx( HDC hDc, @@ -1482,7 +1406,6 @@ BITMAP bmpMask, bmpColor; COLORREF oldFg, oldBg; BOOL DoFlickerFree; - INT nStretchMode; SIZE IconSize; HDC hdcOff; @@ -1524,7 +1447,31 @@ when cxWidth or cyHeight is 0 */ if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) { - bAlpha = TRUE; + SURFACE *psurfOff = NULL; + PFN_DIB_GetPixel fnSource_GetPixel = NULL; + INT x, y; + + //Find alpha into icon + psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); + if (psurfOff) + { + fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; + if (fnSource_GetPixel) + { + for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++) + { + for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++) + { + bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x, y) >> 24) & 0xff); + if (bAlpha) + break; + } + if (bAlpha) + break; + } + } + SURFACE_UnlockSurface(psurfOff); + } } if (!diFlags) @@ -1608,8 +1555,6 @@ goto cleanup; } - nStretchMode = IntGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); @@ -1622,7 +1567,7 @@ goto cleanup; } - DoStretchBlt(hdcOff, + NtGdiStretchBlt(hdcOff, (DoFlickerFree || bAlpha ? 0 : xLeft), (DoFlickerFree || bAlpha ? 0 : yTop), cxWidth, @@ -1633,7 +1578,7 @@ IconSize.cx, IconSize.cy, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), - FALSE); + 0); NtGdiSelectBitmap(hdcMem, hOldMem); } @@ -1642,7 +1587,7 @@ { hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); - DoStretchBlt(hdcOff, + NtGdiStretchBlt(hdcOff, (DoFlickerFree || bAlpha ? 0 : xLeft), (DoFlickerFree || bAlpha ? 0 : yTop), cxWidth, @@ -1653,7 +1598,7 @@ IconSize.cx, IconSize.cy, ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - NULL != hbmColor); + 0); NtGdiSelectBitmap(hdcMem, hOldMem); } @@ -1729,7 +1674,6 @@ IntGdiSetTextColor(hdcOff, oldFg); IntGdiSetBkColor(hdcOff, oldBg); - IntGdiSetStretchBltMode(hdcOff, nStretchMode); Ret = TRUE;

2 1

Re: [ros-dev] rosapps
by WaxDragon 12 Mar '09

12 Mar '09

The only things I have habitually used in rosapps are ctm, ncftp, and download. I'd hate to see these go away. OTOH, there are quite a few things that l would consider "tests" in rosapps that could be moved. I think the argument that rosapps to long to build is crap. If you want to reduce the build time, ditch explorer. On Mar 12, 2009 11:02 AM, "Ged" <gedmurphy(a)gmail.com> wrote: I prefer this idea. I'd like to see rosapps removed completely and have all non essential stuff in trunk built via an rbuild variable (turned off by default) Ged. -----Original Message----- From: ros-dev-bounces(a)reactos.org [mailto: ros-dev-bounces(a)reactos.org] ... Behalf Of Thomas Bluemel Sent: 12 March 2009 14:17 To: ReactOS Development List Subject: Re: [ros-de...

2 1

Restructuring ReactOS
by Richard Campbell 10 Mar '09

10 Mar '09

Hi Guys, One of the big issues I'm seeing with regards to ReactOS is the lack of overall structure. Currently ReactOS is loosely compatible with NT, 2000, XP, and even Vista. However, I believe that in order to achieve true stability and compatibility some changes should be implemented. I'm offering my opinion as a suggestion of how to structure things. While I believe that everyone should be allowed to have fun developing a great project, I believe that we can still do this, while maintaining a little more structure. Please feel free to comment on this email. First Issue: Moving Target Every since I first started watching ReactOS in 2001, I've noticed that ROS is suffering from moving target syndrome. Microsoft continually releases new versions of Windows each year, and ROS struggles to keep up. driver compatibility, app compatibility, etc. are all affected by this. Development is all over the place. If someone knows how to implement a vista API call, they do it. XP? Same, etc. The problem is this can cause compatibility issues with drivers and apps that do DLL hooking, as well as other oddball scenarios. In order to have truely 100% compatibility, we need to find a way to deal with this type of development. I propose picking a single target, Either Windows XP or Windows 2003, to serve as the trunk (I currently recommend Windows XP since it is compatible with nearly everything out there.) All core development will be based around this. Our releases will be based around this. Branches will be created for Windows 7, Windows Server 2008, and Windows Vista specific code. Any platform specific code will go into this branch. Any code that is no longer valid will be removed from this branch. This allows multiple versions of Windows to be targetted at the same time. The trunk will continue on it's path until a) It is 90-100% compatible with most apps/drivers or b) XP/2003 become so old and out of date they aren't used by anyone anymore, similar to the way 98/NT4/2000 are now. If either of those scenarios happen, we vote to switch to a different branch. We should avoid switching to the most cutting edge version of windows, however, and instead focus on the most widely used version at the time. Second Issue: ROS Hacks I've noticed that a lot of times, people implement app specific hacks in ROS, or worse, they implement ROS specific hacks in different apps. Both of these are very bad practices. Instead of doing either of these, I'd recommend discussing the problems you find with the other developers over the mailing list. For instance, if app XYZ is working, rather than submitting a hackish patch to get it to work, find the root cause of the issue, and solve it there or ask for help to solve it. Third Issue: Unit Tests While there are winetests as well as other small tests, ReactOS (That i know of, unless it's in a seperate repo) does not have an official testing framework. Each developer here should take some time out and write a test for every api currently supported by windows, make it pass on Windows, and then commit it to SVN. If we all write tests, This will help identify bugs in ROS vs Windows. Low level tests are ESPECIALLY needed. Our driver compatibility currently sucks, and it's getting worse every day. Unit testing for driver specific APIs and the HAL would help improve ROS dramatically. Final Issue: Stop mixing user and kernel mode code. On occasion i see developers use ReactOS specific kernel mode code in userland. This process should be avoided. All ROS apps should work on both Windows and ROS, and should not contain any ROS specific checks,etc. This goes back to the second issue. I look forward to hearing your responses to my opinion, and I hope that we can work on getting at least some of these opinions implemented so that we may build a truly great Microsoft Windows Compatible Alternative! Thanks, Richard Campbell

6 7

Restructuring ReactOS...
by Richard Campbell 10 Mar '09

10 Mar '09

Restructuring ReactOS Hi Guys, One of the big issues I'm seeing with regards to ReactOS is the lack of overall structure. Currently ReactOS is loosely compatible with NT, 2000, XP, and even Vista. However, I believe that in order to achieve true stability and compatibility some changes should be implemented. I'm offering my opinion as a suggestion of how to structure things. While I believe that everyone should be allowed to have fun developing a great project, I believe that we can still do this, while maintaining a little more structure. Please feel free to comment on this email. First Issue: Moving Target Every since I first started watching ReactOS in 2001, I've noticed that ROS is suffering from moving target syndrome. Microsoft continually releases new versions of Windows each year, and ROS struggles to keep up. driver compatibility, app compatibility, etc. are all affected by this. Development is all over the place. If someone knows how to implement a vista API call, they do it. XP? Same, etc. The problem is this can cause compatibility issues with drivers and apps that do DLL hooking, as well as other oddball scenarios. In order to have truely 100% compatibility, we need to find a way to deal with this type of development. I propose picking a single target, Either Windows XP or Windows 2003, to serve as the trunk (I currently recommend Windows XP since it is compatible with nearly everything out there.) All core development will be based around this. Our releases will be based around this. Branches will be created for Windows 7, Windows Server 2008, and Windows Vista specific code. Any platform specific code will go into this branch. Any code that is no longer valid will be removed from this branch. This allows multiple versions of Windows to be targetted at the same time. The trunk will continue on it's path until a) It is 90-100% compatible with most apps/drivers or b) XP/2003 become so old and out of date they aren't used by anyone anymore, similar to the way 98/NT4/2000 are now. If either of those scenarios happen, we vote to switch to a different branch. We should avoid switching to the most cutting edge version of windows, however, and instead focus on the most widely used version at the time. Second Issue: ROS Hacks I've noticed that a lot of times, people implement app specific hacks in ROS, or worse, they implement ROS specific hacks in different apps. Both of these are very bad practices. Instead of doing either of these, I'd recommend discussing the problems you find with the other developers over the mailing list. For instance, if app XYZ is working, rather than submitting a hackish patch to get it to work, find the root cause of the issue, and solve it there or ask for help to solve it. Third Issue: Unit Tests While there are winetests as well as other small tests, ReactOS (That i know of, unless it's in a seperate repo) does not have an official testing framework. Each developer here should take some time out and write a test for every api currently supported by windows, make it pass on Windows, and then commit it to SVN. If we all write tests, This will help identify bugs in ROS vs Windows. Low level tests are ESPECIALLY needed. Our driver compatibility currently sucks, and it's getting worse every day. Unit testing for driver specific APIs and the HAL would help improve ROS dramatically. Final Issue: Stop mixing user and kernel mode code. On occasion i see developers use ReactOS specific kernel mode code in userland. This process should be avoided. All ROS apps should work on both Windows and ROS, and should not contain any ROS specific checks,etc. This goes back to the second issue. I look forward to hearing your responses to my opinion, and I hope that we can work on getting at least some of these opinions implemented so that we may build a truly great Microsoft Windows Compatible Alternative! Thanks, Richard Campbell

1 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 39925: - Implement a new Hyperspace Mapping Interface: - The new interface is portable and much faster than before. For example, unmapping a hyperpage is almost a one-line operation. - The new interface is
by James Tabor 10 Mar '09

10 Mar '09

Hi, Qemu w Head: (subsystems/win32/win32k/ntuser/desktop.c:612) RtlQueryRegistryValues failed for PaintDesktopVersion (c0000034) err:(base/system/winlogon/screensaver.c:86) ImpersonateLoggedOnUser() failed with error 5 (ntoskrnl/se/semgr.c:613) Denying access for caller: granted 0x600e8, desired 0xf01ff (generic mapping 80F290E8) Assertion 'PointerPte->u.Hard.Valid == 0' failed at ntoskrnl/mm/hypermap.c line 100 Entered debugger on embedded INT3 at 0x0008:0x808c1e7e. kdb:> bt Eip: <NTOSKRNL.EXE:c1e7f> Frames: <NTOSKRNL.EXE:7c608> <NTOSKRNL.EXE:7615f> On Tue, Mar 10, 2009 at 4:53 AM, Aleksey Bragin <aleksey(a)reactos.org> wrote: > Boot is broken for me in VMWare, with an assert being hit in > hypermap.c:178. > > > WBR, > Aleksey Bragin. >

1 0

Re: [ros-dev] [ros-diffs] [ros-arm-bringup] 39925: - Implement a new Hyperspace Mapping Interface: - The new interface is portable and much faster than before. For example, unmapping a hyperpage is almost a one-line operation. - The new interface is also thread-safe and uses the EPROCESS hyperspace spinlock. - However, in order to isolate from React Mm internals, the Hyper IRQL and Process are stored as globals, so this will not work on SMP. - For now, mapping vs. zero PTEs are not treated differently, but
by Aleksey Bragin 10 Mar '09

10 Mar '09

Boot is broken for me in VMWare, with an assert being hit in hypermap.c:178. WBR, Aleksey Bragin. On Mar 10, 2009, at 3:31 AM, ros-arm-bringup(a)svn.reactos.org wrote: > Author: ros-arm-bringup > Date: Tue Mar 10 03:31:14 2009 > New Revision: 39925 > > URL: http://svn.reactos.org/svn/reactos?rev=39925&view=rev > Log: > - Implement a new Hyperspace Mapping Interface: > - The new interface is portable and much faster than before. > For example, unmapping a hyperpage is almost a one-line operation. > - The new interface is also thread-safe and uses the EPROCESS > hyperspace spinlock. > - However, in order to isolate from React Mm internals, the > Hyper IRQL and Process are stored as globals, so this will not work > on SMP. > - For now, mapping vs. zero PTEs are not treated differently, > but the two interfaces have been separated pending future work. > - Performance tests with _rdtsc resulted in an improvement of > over 300% compared to the old interface. > - Hyperspace mappings are frequent, so the improvement is > noticeable during startup (3/10ths of a second). > - This also fixes incorrect initializtion of hyperspace -- > pages were zeroed out (which requires hyperspace) before hyperspace > was created.

1 0

Symbols...
by Timo Kreuzer 10 Mar '09

10 Mar '09

Hi, Can someone please enable symbols for sysreg. Thanks, Timo

1 0

Undocumented field in PEB?
by Jun Koi 06 Mar '09

06 Mar '09

Hi, I notice that in Windows Vista - and also Windows XP - there seems to be an undocumented field in PEB. >From Windbg, I found some below fields in PEB structure' ... +0x064 NumberOfProcessors : Uint4B +0x068 NtGlobalFlag : Uint4B +0x070 CriticalSectionTimeout : _LARGE_INTEGER ... We can see that NtGlobalFlag is at offset 0x68, and is 4 bytes field. So the next field should be at 0x6C. However, CriticalSectionTimeout is at 0x70. - So the question is why that happens? I suspect that there is an undocumented field after NtGlobalFlag, which is removed from the debugging data. Any idea? - Another thing: ReactOS now faithfully declares the PEB structure like above, without that secret 4 bytes hole. As a result, the ReactOS's PEB size is 4 bytes short than PEB structure in Windows. Do we need to care about that? Or not? Thanks, J

4 6

KPROCESS update?
by Jun Koi 04 Mar '09

04 Mar '09

Hi, I examined Windows XP 3, latest update, and found some differences in its KPROCESS and our KPROCESS definition. Specifically, in our KPROCESS we have the union of ProcessFlags, between 2 fields Affinity, and BasePriority. This ProcessFlags field is 4 bytes in size. But XP3's KPROCESS has no such a ProcessFlags at that place. Instead, they have a field named StackCount, with only 2 bytes in size. So I wonder why there is the difference. The answer might be that we have not updated ketypes.h for a long time, and latest update of Windows changed some structures, therefore we have not catched up with yet. 1) Is that the correct understanding? 2) If so, will we update our structures to reflect the changes? Below is the output from my Windows XP. Thanks, J Windows XP Kernel Version 2600 (Service Pack 3) UP Free x86 compatible Product: WinNt, suite: TerminalServer SingleUserTS Personal Built by: 2600.xpsp_sp3_gdr.080814-1236 kd> dt -a -b -v _KPROCESS ntdll!_KPROCESS struct _KPROCESS, 29 elements, 0x6c bytes +0x000 Header : struct _DISPATCHER_HEADER, 6 elements, 0x10 bytes +0x000 Type : UChar +0x001 Absolute : UChar +0x002 Size : UChar +0x003 Inserted : UChar +0x004 SignalState : Int4B +0x008 WaitListHead : struct _LIST_ENTRY, 2 elements, 0x8 bytes +0x000 Flink : Ptr32 to +0x004 Blink : Ptr32 to +0x010 ProfileListHead : struct _LIST_ENTRY, 2 elements, 0x8 bytes +0x000 Flink : Ptr32 to +0x004 Blink : Ptr32 to +0x018 DirectoryTableBase : (2 elements) Uint4B +0x020 LdtDescriptor : struct _KGDTENTRY, 3 elements, 0x8 bytes +0x000 LimitLow : Uint2B +0x002 BaseLow : Uint2B +0x004 HighWord : union __unnamed, 2 elements, 0x4 bytes +0x000 Bytes : struct __unnamed, 4 elements, 0x4 bytes +0x000 BaseMid : UChar +0x001 Flags1 : UChar +0x002 Flags2 : UChar +0x003 BaseHi : UChar +0x000 Bits : struct __unnamed, 10 elements, 0x4 bytes +0x000 BaseMid : Bitfield Pos 0, 8 Bits +0x000 Type : Bitfield Pos 8, 5 Bits +0x000 Dpl : Bitfield Pos 13, 2 Bits +0x000 Pres : Bitfield Pos 15, 1 Bit +0x000 LimitHi : Bitfield Pos 16, 4 Bits +0x000 Sys : Bitfield Pos 20, 1 Bit +0x000 Reserved_0 : Bitfield Pos 21, 1 Bit +0x000 Default_Big : Bitfield Pos 22, 1 Bit +0x000 Granularity : Bitfield Pos 23, 1 Bit +0x000 BaseHi : Bitfield Pos 24, 8 Bits +0x028 Int21Descriptor : struct _KIDTENTRY, 4 elements, 0x8 bytes +0x000 Offset : Uint2B +0x002 Selector : Uint2B +0x004 Access : Uint2B +0x006 ExtendedOffset : Uint2B +0x030 IopmOffset : Uint2B +0x032 Iopl : UChar +0x033 Unused : UChar +0x034 ActiveProcessors : Uint4B +0x038 KernelTime : Uint4B +0x03c UserTime : Uint4B +0x040 ReadyListHead : struct _LIST_ENTRY, 2 elements, 0x8 bytes +0x000 Flink : Ptr32 to +0x004 Blink : Ptr32 to +0x048 SwapListEntry : struct _SINGLE_LIST_ENTRY, 1 elements, 0x4 bytes +0x000 Next : Ptr32 to +0x04c VdmTrapcHandler : Ptr32 to +0x050 ThreadListHead : struct _LIST_ENTRY, 2 elements, 0x8 bytes +0x000 Flink : Ptr32 to +0x004 Blink : Ptr32 to +0x058 ProcessLock : Uint4B +0x05c Affinity : Uint4B +0x060 StackCount : Uint2B +0x062 BasePriority : Char +0x063 ThreadQuantum : Char +0x064 AutoAlignment : UChar +0x065 State : UChar +0x066 ThreadSeed : UChar +0x067 DisableBoost : UChar +0x068 PowerState : UChar +0x069 DisableQuantum : UChar +0x06a IdealNode : UChar +0x06b Flags : struct _KEXECUTE_OPTIONS, 7 elements, 0x1 bytes +0x000 ExecuteDisable : Bitfield Pos 0, 1 Bit +0x000 ExecuteEnable : Bitfield Pos 1, 1 Bit +0x000 DisableThunkEmulation : Bitfield Pos 2, 1 Bit +0x000 Permanent : Bitfield Pos 3, 1 Bit +0x000 ExecuteDispatchEnable : Bitfield Pos 4, 1 Bit +0x000 ImageDispatchEnable : Bitfield Pos 5, 1 Bit +0x000 Spare : Bitfield Pos 6, 2 Bits +0x06b ExecuteOptions : UChar

5 6

Re: [ros-dev] [ros-diffs] [tkreuzer] 39849: Initial version of a gdi font driver for bitmap fonts (.fon / .fnt). It starts to work, but not yet correctly. Glyphs are truncated. Developed on Windows XP.
by Steven Edwards 03 Mar '09

03 Mar '09

On Mon, Mar 2, 2009 at 9:42 PM, <tkreuzer(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=39849&view=rev > Log: > Initial version of a gdi font driver for bitmap fonts (.fon / .fnt). It starts to work, but not yet correctly. Glyphs are truncated. Developed on Windows XP. Are you planning on using FreeType in this? Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 39841: - Get system color depth for application list
by Ged 02 Mar '09

02 Mar '09

If EnumDisplaySettings fails GetSystemColorDepth could be anything. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 02 March 2009 12:47 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 39841: - Get system color depth for application list Author: dchapyshev Date: Mon Mar 2 15:46:53 2009 New Revision: 39841 URL: http://svn.reactos.org/svn/reactos?rev=39841&view=rev Log: - Get system color depth for application list Modified: trunk/reactos/base/applications/taskmgr/applpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Mon Mar 2 15:46:53 2009 @@ -58,6 +58,29 @@ ); #endif +static INT +GetSystemColorDepth(VOID) +{ + DEVMODE pDevMode; + INT ColorDepth; + + pDevMode.dmSize = sizeof(DEVMODE); + pDevMode.dmDriverExtra = 0; + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &pDevMode); + + switch (pDevMode.dmBitsPerPel) + { + case 32: ColorDepth = ILC_COLOR32; break; + case 24: ColorDepth = ILC_COLOR24; break; + case 16: ColorDepth = ILC_COLOR16; break; + case 8: ColorDepth = ILC_COLOR8; break; + case 4: ColorDepth = ILC_COLOR4; break; + default: ColorDepth = ILC_COLOR; break; + } + + return ColorDepth; +} + INT_PTR CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -101,8 +124,8 @@ column.cx = 95; (void)ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ - (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_SMALL); - (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_NORMAL); + (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(16, 16, GetSystemColorDepth()|ILC_MASK, 0, 1), LVSIL_SMALL); + (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(32, 32, GetSystemColorDepth()|ILC_MASK, 0, 1), LVSIL_NORMAL); UpdateApplicationListControlViewSetting();

1 0

Answers to the questions about r39721 and r39723
by Dmitry Gorbachev 25 Feb '09

25 Feb '09

Hi, Alex Ionescu wrote: > This new hack directly slows down every context switch instead of every > page fault -- the latter is a less important perf hit. This slowdown is very small, especially when comparing with other "Hack of Doom". I just want to see, is it the only raison d'être of that old hack or not. Aleksey Bragin wrote: > Why so, Dmitry? Looks like a hack? IopEnumerateDevice() loads drivers, but link in ArcName directory for a boot device should exist for it.

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 39721: Call IopEnumerateDevice() later, after IopCreateArcNames().
by Aleksey Bragin 24 Feb '09

24 Feb '09

Why so, Dmitry? Looks like a hack? WBR, Aleksey Bragin. On Feb 23, 2009, at 4:17 PM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Mon Feb 23 16:17:07 2009 > New Revision: 39721 > > URL: http://svn.reactos.org/svn/reactos?rev=39721&view=rev > Log: > Call IopEnumerateDevice() later, after IopCreateArcNames(). > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/ > iomgr/iomgr.c?rev=39721&r1=39720&r2=39721&view=diff > ====================================================================== > ======== > --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Mon Feb 23 > 16:17:07 2009 > @@ -496,9 +496,6 @@ > /* Call back drivers that asked for */ > IopReinitializeBootDrivers(); > > - /* Initialize PnP root relations */ > - IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); > - > /* Check if this was a ramdisk boot */ > if (!_strnicmp(LoaderBlock->ArcBootDeviceName, "ramdisk(0)", 10)) > { > @@ -512,6 +509,9 @@ > /* Mark the system boot partition */ > if (!IopMarkBootPartition(LoaderBlock)) return FALSE; > > + /* Initialize PnP root relations */ > + IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); > + > #ifndef _WINKD_ > /* Read KDB Data */ > KdbInit(); >

1 0

Sound code cleanup and structuring
by Andrew Greenwood 24 Feb '09

24 Feb '09

Hi, As you're all probably aware, myself and janderwald are in the process of working on sound. I thought I'd give a brief update on this, but I also need some feedback on the location of the various sound components in our tree as I think it needs a little reorganisation. At present, I am focusing on the user-mode portion of sound support, with the goal of getting NT4 audio drivers working (legacy Sound Blaster cards etc.) while janderwald is getting newer style WDM audio drivers up and running. I don't want to duplicate code, hence I have been intentionally developing some helper libraries that can be easily reused. Think of them as dedicated abstractions of the various Windows APIs with a dedicated purpose (sound support.) The components involved or which are planned are: - Common library for user-mode side of sound support - Helper library specifically for NT4 device sound support (device "discovery" etc.) - sndblst.dll, mmdrv.dll and wdmaud.drv user-mode DLLs (making use of the above two components, slight variation in functionality for each - Windows 3.1 used to use the equivalent of these as the actual drivers, hence why there are multiple.) - Kernel-mode common library for NT4 style sound drivers - Sound Blaster library (to be shared between sndblst.sys and PortCls implementation) - UART401 library (to be shared between mpu401.sys and PortCls implementation) - Kernel Streaming API - Kernel Streaming components - Port Class driver At the moment I have a few things dotted around a "sound" directory within "include/reactos" I also have some stuff in our "lib" directory (the helpers I wrote) Kernel streaming related components seem to be spread around various places in drivers/wdm and drivers/ksfilter My attempts so far at NT4 drivers are still sat in drivers/multimedia Basically, I want to try and structure this better. I don't think sndblst.dll/mmdrv.dll/wdmaud.drv belong in dll/win32, and I'm wondering if my helper libraries for sound should sit next to the relevant components directory-wise. Or are they fine being in "lib"? They're only used for sound components. Finally, does anyone object to me removing the entire of the drivers/multimedia tree as nothing in there works at all? I wrote most of the code there, there is some redundant code from the very early ReactOS days in "sound", I can leave that if it's really needed. I want to start implementing sndblst.sys properly so I want to clean up a bit first, but thought I'd ask first before I do anything further. Andrew

1 0

Re: [ros-dev] [ros-diffs] [dgorbachev] 39723: Remove a hack from KiTrap14. Put a hack in other place.
by Alex Ionescu 23 Feb '09

23 Feb '09

This new hack directly slows down every context switch instead of every page fault -- the latter is a less important perf hit. Best regards, Alex Ionescu On Mon, Feb 23, 2009 at 1:18 PM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Mon Feb 23 16:18:28 2009 > New Revision: 39723 > > URL: http://svn.reactos.org/svn/reactos?rev=39723&view=rev > Log: > Remove a hack from KiTrap14. Put a hack in other place. > > Modified: > trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S > trunk/reactos/ntoskrnl/ke/i386/trap.s > > Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Feb 23 > 16:18:28 2009 > @@ -389,6 +389,9 @@ > > /* Checking NPX, disable interrupts now */ > mov eax, [esi+KTHREAD_INITIAL_STACK] > + > + /* HACK */ > + mov ecx, [eax - 4] > cli > > /* Get the NPX State */ > > Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Feb 23 16:18:28 > 2009 > @@ -1924,10 +1924,6 @@ > NoFixUp: > mov edi, cr2 > > - /* ROS HACK: Sometimes we get called with INTS DISABLED! WTF? */ > - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK > - je HandlePf > - > /* Enable interrupts and check if we got here with interrupts disabled > */ > sti > test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK > >

1 0

Hacking Application and Testing ReactOS
by James Tabor 23 Feb '09

23 Feb '09

Hi All! When did this start? Why are we hacking application to work with ReactOS? I see in change 39703 has gone from one kernel call to three. Performance? We need to fix the real problem and it is a very old one too.... SetWindowPos is very broken. Placing bandaids over a bullet wound is not going to fix the problem. Patching around it too! Remember adding hax on top of other hax rant I've posted over the years. Creates more problems and these are still the problems we are having now. Applications must work on other target systems first prior to working with ReactOS. TaskMgr must work on the target system first! Evgeniy Boltik changes are based on good research but testing the changes after is lacking. Evgeniy! Collect and create your test suite of application and test them! AbiWord, FF, ReactOS apps and others that are known to work before your changes. Once you get into a rhythm of testing it becomes easier... Thanks, James

2 1

Re: [ros-dev] [ros-diffs] [dchapyshev] 39709: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin
by Ged 22 Feb '09

22 Feb '09

Shouldn't advapi32 be using CheckTokenMembership ? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dchapyshev(a)svn.reactos.org Sent: 22 February 2009 12:49 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dchapyshev] 39709: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin Author: dchapyshev Date: Sun Feb 22 15:49:18 2009 New Revision: 39709 URL: http://svn.reactos.org/svn/reactos?rev=39709&view=rev Log: - Don't direct call IsUserAnAdmin (setupapi in Windows not linked with shell32) - Implement IsUserAdmin in setupapi (based on shell32 implementation) - Implement pSetupIsUserAdmin Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -153,7 +153,7 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - bAdmin = IsUserAnAdmin(); + bAdmin = IsUserAdmin(); for (i = 0; i < 30; i++) { @@ -209,7 +209,7 @@ FIXME("%p %p %lu %lx %p\n", plcLogConf, dnDevInst, Priority, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (plcLogConf == NULL) @@ -336,7 +336,7 @@ TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -543,7 +543,7 @@ FIXME("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (pdnDevInst == NULL) @@ -713,7 +713,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -812,7 +812,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -1079,7 +1079,7 @@ TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; @@ -3008,7 +3008,7 @@ FIXME("%lx %lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnFromDevInst == 0 || dnToDevInst == 0) @@ -3385,7 +3385,7 @@ TRACE("%lx %lx\n", ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (ulFlags & ~CM_DETECT_BITS) @@ -3903,7 +3903,7 @@ FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAnAdmin()) + if (!IsUserAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -1685,3 +1685,71 @@ { return IsEqualGUID(lpGUID, &GUID_NULL); } + +/* + * implemented + */ +BOOL +WINAPI +IsUserAdmin(VOID) +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + + return bResult; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 22 15:49:18 2009 @@ -213,7 +213,7 @@ @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long) -@ stdcall IsUserAdmin() shell32.IsUserAnAdmin +@ stdcall IsUserAdmin() @ stdcall MyFree(ptr) @ stdcall MyMalloc(long) @ stdcall MyRealloc(ptr long) @@ -566,7 +566,7 @@ @ stub pSetupInstallStopEx @ stdcall pSetupIsGuidNull(ptr) @ stub pSetupIsLocalSystem -@ stub pSetupIsUserAdmin +@ stdcall pSetupIsUserAdmin() IsUserAdmin @ stub pSetupMakeSurePathExists @ stub pSetupMalloc @ stub pSetupModifyGlobalFlags

1 0

SVN server maintenance and upgrade
by Aleksey Bragin 21 Feb '09

21 Feb '09

Hi, we have put our efforts today to upgrade the SVN server machine, which now runs Subversion 1.5.1, and do some routine maintenance like recompressing the reactos repository, reconfiguring everything, etc. As a result, some total (not even readonly access) downtime happened, however it was only slightly more than a couple of hours, so hopefully noone's suffered too much. Now it runs stable, and better than before. Enjoy. Thanks to Franz, Colin and Christoph for helping with setting up and transferring the server. Their help is greatly appreciated. WBR, Aleksey Bragin.

2 1

Re: [ros-dev] Hello Everyone...
by Richard Campbell 19 Feb '09

19 Feb '09

Hi there everyone, Thanks for the comments. Yes, i will be on IRC soon. My AIM username is eek2121. Thanks, Richard Campbell > > > > On Wed, Feb 18, 2009 at 4:04 AM, Aleksey Bragin <aleksey(a)reactos.org> wrote: >> Hi Richard, >> very nice to see you back! >> >> Do you use IRC? If not, any other IM messenger? I could be reached as >> fireballrus(a)gmail.com for gtalk, fireballrus in Skype, 3890063 in ICQ. >> >> If all the above fails, we'll just exchange emails, this is fine too. >> >> >> I'll add your login to the svn, and let you know the password. Your work is >> appreciated! >> >> >> >> WBR, >> Aleksey Bragin. >> >> >> On Feb 18, 2009, at 8:01 AM, Richard Campbell wrote: >> >>> Hi Guys, >>> >>> So After a LONG hiatus I've finally decided to get back into writing >>> code for ReactOS. Some (most?) of you may not remember me. I've been >>> lurking on the lists since 2000-2001, and was an active developer with >>> CVS access for a while back in 2002-2003 (check the commit messages >>> for rcampbell, also submitted quite a few patches). have never stopped >>> reading (although i was/am using a different email address), but >>> haven't touched the code before now. I have a couple of questions: >>> 1) Is my SVN username active? The username is rcampbell. If not, >>> I'll just use bugzilla. 2) Any documentation on coding guidelines >>> such as styles, etc. or rules? I'm sure this has changed since my >>> heyday. >>> >>> Thanks, >>> >>> Richard Campbell >>> _______________________________________________ >>> Ros-dev mailing list >>> Ros-dev(a)reactos.org >>> http://www.reactos.org/mailman/listinfo/ros-dev >> >> >

3 2

truck build problems
by Steven Edwards 19 Feb '09

19 Feb '09

Hi, Does buildbot have its own custom config.rbuild that it uses? I've been having a lot of trouble as I've been trying to boot a build in either vmware or qemu with a virgin ReactOS source tree and RosBE-unix and I always get hung up at the same place. buildbot builds don't show the problem I am having so I am trying to nail down what in the environment could cause the problem. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 3

Mapping Network Drives??
by Nick Couchman 19 Feb '09

19 Feb '09

I've search around the ReactOS site, the mailing lists, and the Wiki, and haven't seen this subject out there much. We have an older application that runs on Windows over a network connection. The software must be run over the network and must have a mapped network drive to function correctly. I know that Samba-TNG is available for ReactOS, but this seems to only smbclient and no way to mount or map a network share. Are there any plans or current efforts to support mapped network drive functionality? Thanks - Nick This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Test mail
by Andrew Greenwood 18 Feb '09

18 Feb '09

Can we e-mail? Yes we can! (I hope...)

3 2

Hello Everyone...
by Richard Campbell 18 Feb '09

18 Feb '09

Hi Guys, So After a LONG hiatus I've finally decided to get back into writing code for ReactOS. Some (most?) of you may not remember me. I've been lurking on the lists since 2000-2001, and was an active developer with CVS access for a while back in 2002-2003 (check the commit messages for rcampbell, also submitted quite a few patches). have never stopped reading (although i was/am using a different email address), but haven't touched the code before now. I have a couple of questions: 1) Is my SVN username active? The username is rcampbell. If not, I'll just use bugzilla. 2) Any documentation on coding guidelines such as styles, etc. or rules? I'm sure this has changed since my heyday. Thanks, Richard Campbell

6 5

ping pong
by Richard Campbell 18 Feb '09

18 Feb '09

ping?

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 39637: fix formatting
by Hervé Poussineau 17 Feb '09

17 Feb '09

tkreuzer(a)svn.reactos.org a écrit : > Author: tkreuzer > Date: Mon Feb 16 21:57:45 2009 > New Revision: 39637 > > URL: http://svn.reactos.org/svn/reactos?rev=39637&view=rev > Log: > fix formatting ... > @@ -118,7 +122,7 @@ > KeAcquireSpinLock(Lock, &OldIrql); > Result = *Destination; > if(*Destination == Result) > - *Destination = *Exchange; > + *Destination = *Exchange; > KeReleaseSpinLock(Lock, OldIrql); > return Result; > } > Is formatting really better now?

1 0

[ros-diffs] [dgorbachev] 39422: Fix bug #4129 in CmpGetNameControlBlock().
by Dmitry Gorbachev 17 Feb '09

17 Feb '09

> No, it's just a matter of coding style used in the kernel. What is a logical basis for adopting this particular rule? Sometimes it is not just a matter of preference. These parentheses are unnecessary for humans, and if they are not needed for compilers or some other tools, they are bad! Without them, the bug could be noticed earlier. Cheers, Dmitry

7 13

[ros-diffs] [dgorbachev] 39422: Fix bug #4129 in CmpGetNameControlBlock().
by Dmitry Gorbachev 17 Feb '09

17 Feb '09

Well, there should be some limit of the number of parentheses, you will probably not want to use them in the a + b * c expression.

2 1

[ros-diffs] [dgorbachev] 39422: Fix bug #4129 in CmpGetNameControlBlock().
by Dmitry Gorbachev 17 Feb '09

17 Feb '09

> I personally feel consistent application of the style is also important, > and that there does not exist a reason to deviate from the established > coding style in this situation. I agree that it is good to follow the consistent coding style. The question is this style itself is good. I meant the abstract case of ((a = b) && (c = d)), not the concrete case of ((ConvKey == HashEntry->ConvKey) && (Length == Ncb->NameLength)).

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev