- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [hyperion] 44091: modified Makefile Give poor pefixup its own echo line modified ReactOS-amd64.rbuild modified ReactOS-arm.rbuild modified ReactOS-i386.rbuild Set global linker flags globally Goodbye NTOSKRNL_SHARED modified tools/rbuild/b
by Ged Murphy 11 Nov '09

11 Nov '09

Not sure about codeblocks but I still use the msvc backend to generate all the vcproj files. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of hyperion(a)svn.reactos.org Sent: 11 November 2009 03:41 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [hyperion] 44091: modified Makefile Give poor pefixup its own echo line modified ReactOS-amd64.rbuild modified ReactOS-arm.rbuild modified ReactOS-i386.rbuild Set global linker flags globally Goodbye NTOSKRNL_SHARED modified tools/rbuild/backe modified tools/rbuild/backend/codeblocks/codeblocks.cpp modified tools/rbuild/backend/msvc/vcprojmaker.cpp Build fixes. I really want to delete these dead backends

4 3

want to learn
by rahul nagpal 10 Nov '09

10 Nov '09

Hey, i can get th source code of reactos, but i can't understand the coding, your programmer who wrote these type of coding can also be refer any book/notes.You please tell me the name of that book, for which i can also take refrence for understanding the lower level of coding for making kernel and other files.I know these type of languages(C,C++,Java Core,VC++,Oracle 8i,html),but not for the hardware level only for making user level programs.So Please help me do this task easier and i also tell you that i didn't know the way to access your channel #reactos also help me i have no sufficient time to take part in it but i try so please refer any book.Thanxxx for making me the member of your group and Congratulations for your Project Success... :) (:

5 6

Re: [ros-dev] [ros-diffs] [tkreuzer] 44052: [NDK] - Add KEXCEPTION_FRAME offsets
by Alex Ionescu 09 Nov '09

09 Nov '09

Did you make sure these matched the actual Microsoft-defined offsets in ksamd64? On 2009-11-09, at 2:49 PM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Mon Nov 9 20:49:47 2009 > New Revision: 44052 > > URL: http://svn.reactos.org/svn/reactos?rev=44052&view=rev > Log: > [NDK] > - Add KEXCEPTION_FRAME offsets > > Modified: > branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h > > Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h > URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… > ============================================================================== > --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) > +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Mon Nov 9 20:49:47 2009 > @@ -192,6 +192,42 @@ > #define CONTEXT_LastExceptionFromRip 0x4c8 > > // > +// KEXCEPTION_FRAME offsets > +// > +#define KEXCEPTION_FRAME_P1Home 0x000 > +#define KEXCEPTION_FRAME_P2Home 0x008 > +#define KEXCEPTION_FRAME_P3Home 0x010 > +#define KEXCEPTION_FRAME_P4Home 0x018 > +#define KEXCEPTION_FRAME_P5 0x020 > +#define KEXCEPTION_FRAME_InitialStack 0x028 > +#define KEXCEPTION_FRAME_Xmm6 0x030 > +#define KEXCEPTION_FRAME_Xmm7 0x040 > +#define KEXCEPTION_FRAME_Xmm8 0x050 > +#define KEXCEPTION_FRAME_Xmm9 0x060 > +#define KEXCEPTION_FRAME_Xmm10 0x070 > +#define KEXCEPTION_FRAME_Xmm11 0x080 > +#define KEXCEPTION_FRAME_Xmm12 0x090 > +#define KEXCEPTION_FRAME_Xmm13 0x0A0 > +#define KEXCEPTION_FRAME_Xmm14 0x0B0 > +#define KEXCEPTION_FRAME_Xmm15 0x0C0 > +#define KEXCEPTION_FRAME_TrapFrame 0x0D0 > +#define KEXCEPTION_FRAME_CallbackStack 0x0D8 > +#define KEXCEPTION_FRAME_OutputBuffer 0x0E0 > +#define KEXCEPTION_FRAME_OutputLength 0x0E8 > +#define KEXCEPTION_FRAME_MxCsr 0x0F0 > +#define KEXCEPTION_FRAME_Rbp 0x0F8 > +#define KEXCEPTION_FRAME_Rbx 0x100 > +#define KEXCEPTION_FRAME_Rdi 0x108 > +#define KEXCEPTION_FRAME_Rsi 0x110 > +#define KEXCEPTION_FRAME_R12 0x118 > +#define KEXCEPTION_FRAME_R13 0x120 > +#define KEXCEPTION_FRAME_R14 0x128 > +#define KEXCEPTION_FRAME_R15 0x130 > +#define KEXCEPTION_FRAME_Return 0x138 > +#define SIZE_KEXCEPTION_FRAME 0x140 > + > + > +// > // EXCEPTION_RECORD Offsets > // > #define EXCEPTION_RECORD_ExceptionCode 0x00 > > Best regards, Alex Ionescu

1 0

Re: [ros-dev] [ros-diffs] [sginsberg] 43958: - Fix the "fix" of un-protecting the 7 IDT entries on P5 in HAL's BIOS call code when setting the custom Invalid Opcode handler
by Dmitry Gorbachev 08 Nov '09

08 Nov '09

Hi! This change causes a crash when booting, on Pentium.

3 4

Reactos and MinWin
by Gerard Murphy 03 Nov '09

03 Nov '09

I've recently been taking an interest in MinWin, especially as it's now visible in Windows 7, and I want to bring up the possibility of introducing something similar into ReactOS. I know some of you will be familiar with WinWin and I know at least one of you will know quite a bit more about it than I do, but for those who don't here's an overview. What is WinMin? MinWin is an internal project at Microsoft that manifested around the time of the Vista rewrite. Very basically explained, the aim is to detangle the very core components from the full operating system, resulting in something which can be built separately and leaving just enough components for a working system. This minimal operating system can then boot and be tested separately or be built as part of the full OS and tested in internally as before. The main problem in doing this, and one of the main benefits in solving it, is module dependencies. By simply cutting out the bottom part of the OS you're left with modules which potentially call out to other modules which may now be missing. If these dependencies aren't understood you have the possibility of an unstable OS as you never know where a code path may lead. It also means you need to build more components to get the thing to link, which also undermines one of the reasons for doing it. What Microsoft did is to draw up a dependency tree and structure it in a layered hierarchy. Modules were then rearranged to make architectural sense according to the NT design and a top layer was decided upon. API call were then rewritten within this hierarchy such that anything in one layer would only call API's in the layers below it. Therefore if something in layer 8 called something in layer 7 which then called something in layer 12, the APIs would be fixed to only use APIs at or below its level according to the hierarchy. You're then left with a clean line where nothing calls out and you have a tightly bound core OS which is completely independent from anything. What is essentially left in Microsoft's WinMin is what people class as Cutlers NT along with supporting components to get a bootable system. The main components are: The kernel (main kernel, not the full ntoskrnl module), parts of the executive, memory manager, networking, a file system driver and core drivers (basc IO and Bus, etc) This is then exposed in usermode by 2 dlls, ntdll.dll and the new kernelbase.dll. On top of this you have a console for issuing commands. This comprises of the full OS and amounts to about 25Mb on disk and has around a 40Mb working set. Let's quickly explain the new kernelbase dll. As many of the API's in the lower level dlls such as kernel32 and advapi32 were targeting functionality which wasn't in WinMin, it was decided to pull out any of the API's which were required to exercise WinMin and put them into kernelbase. This dll could then be used when building a running WinMin to provide all the functionality this kernel offered. The dlls which had their APIs removed now forwarded their call onto kernelbase so from a user perspective, nothing had changed. Microsoft went a step further and designed a new technology around virtual dlls. They split functionality of dlls into 'api sets' These can now be seen in Win 7 in the system32 dir with the prefix 'api-ms-win-core-<function>-<num of>-1-0.dll'. WinMin components now link against these virtual dlls which load up the real libs listed in apisetschema.dll. However this involves modification to the loader and I don't think it's something worth us considering right now. What are the reasons for doing this? For a start, it's a much better design from an engineering perspective. The more software you have running on a system the more noise is created and the more things can interfere with each other. It gives us a base to innovate with without worrying about affecting anything outside. It gives us a more reliable base for the OS and a better platform to run comprehensive and efficient tests. It makes us more attractive to external companies as we would have a slick NT compatible kernel ready for companies to build their products on, especially embedded applications. With a few more additional items such as the base win32 subsystem, we'd have something along the lines of a stripped out ServerCore or Windows PE. This is only a quick overview for discussion purposes, but it outlines the main design and goals of WinMin. Comments, questions, concerns and gripes welcome J Ged.

10 16

0.3.11 Status update
by Aleksey Bragin 03 Nov '09

03 Nov '09

Hello, updating everyone on the 0.3.11 status. There is one blocker bug, http://www.reactos.org/bugzilla/ show_bug.cgi?id=4934, which is rapps's inability to complete any download in VMWare. Other regressions (including VMWare video driver, samba-TNG problm) are also present, however they could be either hacked away for release or shipped - e.g. not much of a problem since VMWare Video Driver installer doesn't work in new VMWares anyway. Amount of positive changes outweighs the negative. Please try to have a look at the 4934 bug to fix it ASAP. WBR, Aleskey Bragin.

1 0

Integration of ultracopier to reactOS
by alpha_one_x86 03 Nov '09

03 Nov '09

Hello, I'm the developper of ultracopier, I propose ultracopier as default copier under reactOS for the reactOS explorer. I will activly developpe it under reactOS. It based on Qt. Only the version 0.2.0.0 is developped for reactOS. Screenshot: http://ultracopier.first-world.info/screenshots/reactOS-ultracopier.png -- alpha_one_x86 <alpha_one_x86(a)first-world.info> Main developper of Ultracopier, Esourcing and server management IT, OS, technologies, security and business department

8 21

Re: [ros-dev] [ros-diffs] [hpoussin] 43875: [freeldr/WINLDR] Simplify freeldr.ini syntax for common cases - If boot type is not specified, autodetect bootsector and Windows types - Try to automatically detect version of loaded Windows - Accept boot options after name of OS - Separate loading and scanning of system hive As a result, lines like "multi(0)disk(0)rdisk(0)partition(1)\WINNT="Windows NT4" /DEBUG /BREAK" work
by Aleksey Bragin 01 Nov '09

01 Nov '09

Booting via "ReactOS (Debug)" is broken - when trying to select it, it jumps back to the first item in the list. On Oct 31, 2009, at 6:09 PM, hpoussin(a)svn.reactos.org wrote: > Author: hpoussin > Date: Sat Oct 31 16:09:03 2009 > New Revision: 43875 > > URL: http://svn.reactos.org/svn/reactos?rev=43875&view=rev > Log: > [freeldr/WINLDR] Simplify freeldr.ini syntax for common cases > - If boot type is not specified, autodetect bootsector and Windows > types > - Try to automatically detect version of loaded Windows > - Accept boot options after name of OS > - Separate loading and scanning of system hive > As a result, lines like "multi(0)disk(0)rdisk(0)partition(1) > \WINNT="Windows NT4" /DEBUG /BREAK" work > > Modified: > trunk/reactos/boot/freeldr/freeldr/bootmgr.c > trunk/reactos/boot/freeldr/freeldr/include/winldr.h > trunk/reactos/boot/freeldr/freeldr/oslist.c > trunk/reactos/boot/freeldr/freeldr/windows/winldr.c > trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c

1 0

Re: [ros-dev] Happy Halloween!!!
by Stefan L. 01 Nov '09

01 Nov '09

here they just say: Trick or Treat! Smell my feet! Give me sonething good to eat, If you dont: I dont care. I just eat my underwere! :) Happy halloween to all!!!!1 - original message - Subject: Re: [ros-dev] Happy Halloween!!! From: WaxDragon <waxdragon(a)gmail.com> Date: 01/11/2009 12:23 am My daughter preferred, "Trick or Treat, Piece of Meat!" On Oct 31, 2009 8:17 PM, "Brian" <briandabrain(a)gmail.com> wrote: Trick or treat! Smell my feet! Give me something good to eat!!! -- brian _______________________________________________ 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

Happy Halloween!!!
by Brian 01 Nov '09

01 Nov '09

Trick or treat! Smell my feet! Give me something good to eat!!! -- brian

2 1

Commit by janderwald :: r43874 reactos/dll/directx/dsound_new/ (17 files): * Start rewrite of DirectSound
by Javier Agustìn Fernàndez Arroyo 31 Oct '09

31 Oct '09

hi, i wonder if this commit should be sync'ed in the reactx branch...... (and, if DSound should be synced as a whole in there) im not dev, so its up to you devs.... And if not.. why?

2 1

Using alternative compilers to build ReactOS...
by King InuYasha 31 Oct '09

31 Oct '09

Hello, I had noticed that some of the developers are working pretty vigorously to get off of requiring GCC. I don't pretend to understand what that is about, and I honestly would like to know.. However, I just wanted to list a couple of alternative open source C/C++ compilers that could probably be used with ReactOS. Of course, what do I know, I'm just a newbie at being a C++ programmer... Anyway, the two compilers are: * OpenWatcom ( http://openwatcom.org/index.php/Main_Page ) * LLVM 2.6 w/clang ( http://llvm.org/ )

1 0

Re: [ros-dev] Re : [ros-diffs] [sginsberg] 43789: - Replace broken implementation of HalpCalibrateStallExecution with a new implementation by a mysterious HAL ninja and myself. The old implementation calculated the stall count factor incorrectly and
by Steven Edwards 28 Oct '09

28 Oct '09

On Tue, Oct 27, 2009 at 9:32 AM, KJK::Hyperion <hackbunny(a)reactos.org> wrote: > Alex Ionescu wrote: >> I bet Hitler would've said the same at Nuremberg.... > > he wouldn't have, unlike us he had written a specification beforehand Too funny. I love the Mein Kampf as an example of how to do a proper system design specification ;) -- 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] Microsoft PDC
by Love Nystrom 27 Oct '09

27 Oct '09

Ged Murphy wrote: > I’ll be attending this year’s Microsoft PDC in Los Angeles > and I should be there between 16th November and 20th November. You absolutely have to attend the session with Mark Russinovitch "Windows 7 and Windows Server 2008 R2 Kernel Changes". See if you can dig up something useful for our baby ROS. (When they released NT, at least they gave us "Inside Windows NT" :) Oh, and "C++ Forever: Interactive Applications in the Age of Manycore" could be vaguely interesting I guess (the multicore bits). All the other sessions seem to be boring application stuff, C#, ASP.NET, SQL and all that goop. Don't snore on the sessions ;) Rock on // Love __________ Information from ESET Smart Security, version of virus signature database 4549 (20091027) __________ The message was checked by ESET Smart Security. http://www.eset.com

1 0

Microsoft PDC
by Ged Murphy 27 Oct '09

27 Oct '09

I'll be attending this year's Microsoft PDC in Los Angeles and I should be there between 16th November and 20th November. If anyone else is going and wants to meet up for a chat at the conference or a beer in the evening drop me a mail. Cheers, Ged.

2 2

Re: [ros-dev] [ros-diffs] [sginsberg] 43789: - Replace broken implementation of HalpCalibrateStallExecution with a new implementation by a mysterious HAL ninja and myself. The old implementation calculated the stall count factor incorrectly and produced bogus resu
by Gabriel ilardi 27 Oct '09

27 Oct '09

This commit introduces a noticeable delay in VirtualBox: 1) When booting from the CD to install ROS, after FreeLDR has initially loaded and the screen becomes black, here I notice a delay of 6~7 seconds until I see the blue screen to choose the language in usetup. Before the commit it was about 1 sec. 2) In second stage when loading UniATA, it stays there for about 4-5 seconds, there was no delay before. Best regards, Gabriel. > Date: Tue, 27 Oct 2009 01:03:41 +0000 > To: ros-diffs(a)reactos.org > From: sginsberg(a)svn.reactos.org > Subject: [ros-diffs] [sginsberg] 43789: - Replace broken implementation of HalpCalibrateStallExecution with a new implementation by a mysterious HAL ninja and myself. The old implementation calculated the stall count factor incorrectly and produced bogus results that were off by several thousand, and varied by as much for each boot, and can best be described as "rand() made complicated". The new implementation installs its own RTC interrupt handler to accurately calculate the stall scale factor, all done in assembler instead of broken C. Fixes the hang at boot when initializing Uniata as stalls no longer takes 10 times or more as long to execute then they should. > > Author: sginsberg > Date: Tue Oct 27 02:03:41 2009 > New Revision: 43789 > > URL: http://svn.reactos.org/svn/reactos?rev=43789&view=rev > Log: > - Replace broken implementation of HalpCalibrateStallExecution with a new implementation by a mysterious HAL ninja and myself. The old implementation calculated the stall count factor incorrectly and produced bogus results that were off by several thousand, and varied by as much for each boot, and can best be described as "rand() made complicated". The new implementation installs its own RTC interrupt handler to accurately calculate the stall scale factor, all done in assembler instead of broken C. Fixes the hang at boot when initializing Uniata as stalls no longer takes 10 times or more as long to execute then they should. > > Modified: > trunk/reactos/hal/halx86/generic/halinit.c > trunk/reactos/hal/halx86/generic/systimer.S > trunk/reactos/hal/halx86/generic/timer.c > > Modified: trunk/reactos/hal/halx86/generic/halinit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Tue Oct 27 02:03:41 2009 > @@ -97,11 +97,11 @@ > /* Force initial PIC state */ > KfRaiseIrql(KeGetCurrentIrql()); > > + /* Setup busy waiting */ > + HalpCalibrateStallExecution(); > + > /* Initialize the clock */ > HalpInitializeClock(); > - > - /* Setup busy waiting */ > - HalpCalibrateStallExecution(); > > /* Fill out the dispatch tables */ > HalQuerySystemInformation = HaliQuerySystemInformation; > > Modified: trunk/reactos/hal/halx86/generic/systimer.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Tue Oct 27 02:03:41 2009 > @@ -17,11 +17,386 @@ > _HalpLastPerfCounterHigh: .long 0 > _HalpPerfCounterLow: .long 0 > _HalpPerfCounterHigh: .long 0 > +_HalpSystemHardwareLock: .long 0 > +_HalpSystemHardwareFlags: .long 0 > > _UnhandledMsg: > .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" > > /* FUNCTIONS *****************************************************************/ > + > +.global _HalpReleaseCmosSpinLock@0 > +.func HalpReleaseCmosSpinLock@0 > +_HalpReleaseCmosSpinLock@0: > + > +#ifdef CONFIG_SMP > + /* Save clobbered register */ > + push eax > + > + /* Push saved EFLAGS */ > + push _HalpSystemHardwareFlags > + > + /* Release the lock */ > + lea eax, _HalpSystemHardwareLock > + RELEASE_SPINLOCK(eax) > + > + /* Restore EFLAGS */ > + popf > + > + /* Return */ > + pop eax > + ret > +#else > + /* Restore EFLAGS and return */ > + push _HalpSystemHardwareFlags > + popf > + ret > +#endif > +.endfunc > + > +.global _HalpAcquireSystemHardwareSpinLock@0 > +.func HalpAcquireSystemHardwareSpinLock@0 > +_HalpAcquireSystemHardwareSpinLock@0: > + > +#ifdef CONFIG_SMP > + /* Save clobbered register */ > + push eax > + > +HardwareLock: > + /* Save EFLAGS and disable interrupts */ > + pushf > + cli > + > + /* This is the CMOS lock, acquire it */ > + lea eax, _HalpSystemHardwareLock > + ACQUIRE_SPINLOCK(eax, CmosSpin) > + > + /* We have it, return the flags */ > + pop _HalpSystemHardwareFlags > + pop eax > + ret > + > +CmosSpin: > + > + /* Restore EFLAGS */ > + pushf _HalpSystemHardwareLock > + popf > + > + /* Spin */ > + SPIN_ON_LOCK(eax, HardwareLock) > + > +#else > + /* Save EFLAGS, disable interrupts and return */ > + pushf > + cli > + pop _HalpSystemHardwareFlags > + ret > +#endif > +.endfunc > + > +.global _HalpCalibrateStallExecution@0 > +.func HalpCalibrateStallExecution@0 > +_HalpCalibrateStallExecution@0: > + > + /* Setup the stack frame */ > + push ebp > + mov ebp, esp > + sub esp, 12 > + > + /* Save EFLAGS and kill interrupts */ > + pushf > + cli > + > + /* Get the current interrupt mask on the PICs */ > + xor eax, eax > + in al, 0xA1 > + shl eax, 8 > + in al, 0x21 > + > + /* Save it */ > + push eax > + > + /* Now mask everything except the RTC and PIC 2 chain-interrupt */ > + mov eax, ~((1 << 2) | (1 << 8)) > + > + /* Program the PICs */ > + out 0x21, al > + shr eax, 8 > + out 0xA1, al > + > + /* Now get the IDT */ > + sidt [ebp-8] > + mov ecx, [ebp-6] > + > + /* Get the IDT entry for the RTC */ > + mov eax, 0x38 > + shl eax, 3 > + add ecx, eax > + > + /* Save the original RTC ISR */ > + push [ecx] > + push [ecx+4] > + push ecx > + > + /* Now load our new handler */ > + mov eax, offset OnlyOnePersonCanWriteHalCode > + mov [ecx], ax > + mov word ptr [ecx+2], KGDT_R0_CODE > + mov word ptr [ecx+4], 0x8E00 > + shr eax, 16 > + mov [ecx+6], ax > + > + /* Reset our counter */ > + mov dword ptr [ebp-12], 0 > + > + /* Acquire CMOS lock */ > + call _HalpAcquireSystemHardwareSpinLock@0 > + > + /* Now initialize register A on the CMOS */ > + mov ax, (0x2D << 8) | 0xA > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register B */ > + mov ax, 0xB > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Don't touch the LastKnownGoodConfig hack */ > + and al, 1 > + mov ah, al > + > + /* Enable the interrupt */ > + or ah, 0x42 > + > + /* Now write the register B */ > + mov al, 0xB > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register C */ > + mov al, 0xC > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Read register D */ > + mov al, 0xD > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Release CMOS lock */ > + mov dword ptr [ebp-12], 0 > + call _HalpReleaseCmosSpinLock@0 > + > + /* Initialize looper */ > + xor eax, eax > + > + /* Align to 16 bytes */ > + .align 16 > + > + /* Enable interrupts! */ > + sti > + jmp Looper > + > + /* Align to 16 bytes */ > + .align 16 > + > + /* Subtract one count */ > +Looper: > + sub eax, 1 > + jnz Looper > + > + /* ASSERT: If we got here, then the RTC never fired */ > + call _DbgBreakPoint@0 > + jmp Looper > + > +OnlyOnePersonCanWriteHalCode: > + /*********************** THIS IS THE RTC HANDLER **************************/ > + > + /* Increment the interrupt count and check if this is the first one */ > + inc dword ptr [ebp-12] > + cmp dword ptr [ebp-12], 1 > + jnz ComputeStall > + > + /* > + * It is the first one -- we'll ignore it, since it fires randomly! > + * Get rid of the old return address and push the new one in (our looper) > + */ > + pop eax > + push offset Looper > + > + /* Acquire CMOS lock */ > + call _HalpAcquireSystemHardwareSpinLock@0 > + > + /* Now initialize register A on the CMOS */ > + mov ax, (0x2D << 8) | 0xA > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register B */ > + mov ax, 0xB > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Don't touch the LastKnownGoodConfig hack */ > + and al, 1 > + mov ah, al > + > + /* Enable the interrupt */ > + or ah, 0x42 > + > + /* Now write the register B */ > + mov al, 0xB > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register C */ > + mov al, 0xC > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Read register D */ > + mov al, 0xD > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Release CMOS lock */ > + call _HalpReleaseCmosSpinLock@0 > + > + /* Dismiss the interrupt */ > + mov al, 0x20 > + out 0xA0, al > + mov al, 0x62 > + out 0x20, al > + > + /* Reset the counter and return back to the looper */ > + xor eax, eax > + iretd > + > + /******************* THIS IS THE 2ND RTC HANDLER **************************/ > +ComputeStall: > + > + /* Do the calculation */ > + neg eax > + xor edx, edx > + mov ecx, 125000 /* RTC fires every 125 ms */ > + div ecx > + > + /* Is the remainder 0? */ > + cmp edx, 0 > + jz FoundFactor > + > + /* Otherwise fix-up the loop count */ > + inc eax > + > +FoundFactor: > + /* Save the stall scale factor */ > + mov fs:[KPCR_STALL_SCALE_FACTOR], eax > + > + /* Prepare for interrupt return */ > + pop eax > + push offset AndItsNotYou > + mov eax, 0x13 > + > + /* Acquire CMOS lock */ > + call _HalpAcquireSystemHardwareSpinLock@0 > + > + /* Now initialize register A on the CMOS */ > + mov ax, (0x2D << 8) | 0xA > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register B */ > + mov ax, 0xB > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Don't touch the LastKnownGoodConfig hack */ > + and al, 1 > + mov ah, al > + > + /* Disable the interrupt */ > + or ah, 0x2 > + > + /* Now write the register B */ > + mov al, 0xB > + out 0x70, al > + jmp $+2 > + mov al, ah > + out 0x71, al > + jmp $+2 > + > + /* Read register C */ > + mov al, 0xC > + out 0x70, al > + jmp $+2 > + in al, 0x71 > + jmp $+2 > + > + /* Release CMOS lock */ > + call _HalpReleaseCmosSpinLock@0 > + > + /* Dismiss the interrupt */ > + mov al, 0x20 > + out 0xA0, al > + mov al, 0x62 > + out 0x20, al > + > + /* Disable interrupts on return */ > + and word ptr [esp+8], ~EFLAGS_INTERRUPT_MASK > + iretd > + > + /************************* WE ARE BACK FROM RTC ***************************/ > +AndItsNotYou: > + > + /* Restore the IDT */ > + pop ecx > + pop [ecx+4] > + pop [ecx] > + > + /* Restore the mask */ > + pop eax > + out 0x21, al > + shr eax, 8 > + out 0xA1, al > + > + /* Restore EFLAGS */ > + popf > + > + /* Restore stack and return */ > + mov esp, ebp > + pop ebp > + ret > +.endfunc > > .globl _KeStallExecutionProcessor@4 > .func KeStallExecutionProcessor@4 > @@ -53,34 +428,6 @@ > /* Return */ > ret 4 > .endfunc > - > - > -.globl _HalpQuery8254Counter@0 > -.func HalpQuery8254Counter@0 > -_HalpQuery8254Counter@0: > - > - /* Save EFLAGS and disable interrupts */ > - pushfd > - cli > - > - /* Set timer data */ > - mov al, 0 > - out 0x43, al > - jmp $+2 > - > - /* Read current timer */ > - in al, 0x40 > - jmp $+2 > - movzx ecx, al > - in al, 0x40 > - mov ch, al > - > - /* Return it and restore interrupt state */ > - mov eax, ecx > - popfd > - ret > -.endfunc > - > > .global _KeQueryPerformanceCounter@4 > .func KeQueryPerformanceCounter@4 > > Modified: trunk/reactos/hal/halx86/generic/timer.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Tue Oct 27 02:03:41 2009 > @@ -13,11 +13,6 @@ > #include <debug.h> > > /* GLOBALS *******************************************************************/ > - > -/* time to wait */ > -#define MICROSECOND_TO_WAIT 1000 > -/* the tick count for 1 ms is 1193.182 (1193182 Hz) round it up */ > -#define TICKCOUNT_TO_WAIT 1194 > > BOOLEAN HalpClockSetMSRate; > ULONG HalpCurrentTimeIncrement; > @@ -135,161 +130,4 @@ > return HalpRolloverTable[Increment - 1].HighPart; > } > > -ULONG > -WaitFor8254Wraparound(VOID) > -{ > - ULONG StartTicks; > - ULONG PrevTicks; > - LONG Delta; > - > - StartTicks = HalpQuery8254Counter(); > - > - do > - { > - PrevTicks = StartTicks; > - StartTicks = HalpQuery8254Counter(); > - Delta = StartTicks - PrevTicks; > - > - /* > - * This limit for delta seems arbitrary, but it isn't, it's > - * slightly above the level of error a buggy Mercury/Neptune > - * chipset timer can cause. > - */ > - > - } > - while (Delta < 300); > - > - return StartTicks; > -} > - > -VOID > -NTAPI > -HalpCalibrateStallExecution(VOID) > -{ > - ULONG CalibrationBit; > - ULONG EndTicks; > - ULONG StartTicks; > - ULONG OverheadTicks; > - PKIPCR Pcr; > - > - Pcr = (PKIPCR)KeGetPcr(); > - > - /* Measure the delay for the minimum call overhead in ticks */ > - Pcr->StallScaleFactor = 1; > - StartTicks = WaitFor8254Wraparound(); > - KeStallExecutionProcessor(1); > - EndTicks = HalpQuery8254Counter(); > - OverheadTicks = (StartTicks - EndTicks); > - > - do > - { > - /* Increase the StallScaleFactor */ > - Pcr->StallScaleFactor = Pcr->StallScaleFactor * 2; > - > - if (Pcr->StallScaleFactor == 0) > - { > - /* Nothing found */ > - break; > - } > - > - /* Get the start ticks */ > - StartTicks = WaitFor8254Wraparound(); > - > - /* Wait for a defined time */ > - KeStallExecutionProcessor(MICROSECOND_TO_WAIT); > - > - /* Get the end ticks */ > - EndTicks = HalpQuery8254Counter(); > - > - DPRINT("Pcr->StallScaleFactor: %d\n", Pcr->StallScaleFactor); > - DPRINT("Time1 : StartTicks %i - EndTicks %i = %i\n", > - StartTicks, EndTicks, StartTicks - EndTicks); > - } while ((StartTicks - EndTicks) <= (TICKCOUNT_TO_WAIT + OverheadTicks)); > - > - /* A StallScaleFactor lesser than INITIAL_STALL_COUNT makes no sense */ > - if (Pcr->StallScaleFactor >= (INITIAL_STALL_COUNT * 2)) > - { > - /* Adjust the StallScaleFactor */ > - Pcr->StallScaleFactor = Pcr->StallScaleFactor / 2; > - > - /* Setup the CalibrationBit */ > - CalibrationBit = Pcr->StallScaleFactor; > - > - for (;;) > - { > - /* Lower the CalibrationBit */ > - CalibrationBit = CalibrationBit / 2; > - if (CalibrationBit == 0) > - { > - break; > - } > - > - /* Add the CalibrationBit */ > - Pcr->StallScaleFactor = Pcr->StallScaleFactor + CalibrationBit; > - > - /* Get the start ticks */ > - StartTicks = WaitFor8254Wraparound(); > - > - /* Wait for a defined time */ > - KeStallExecutionProcessor(MICROSECOND_TO_WAIT); > - > - /* Get the end ticks */ > - EndTicks = HalpQuery8254Counter(); > - > - DPRINT("Pcr->StallScaleFactor: %d\n", Pcr->StallScaleFactor); > - DPRINT("Time2 : StartTicks %i - EndTicks %i = %i\n", > - StartTicks, EndTicks, StartTicks - EndTicks); > - > - if ((StartTicks-EndTicks) > (TICKCOUNT_TO_WAIT+OverheadTicks)) > - { > - /* Too big so subtract the CalibrationBit */ > - Pcr->StallScaleFactor = Pcr->StallScaleFactor - CalibrationBit; > - } > - } > - DPRINT("New StallScaleFactor: %d\n", Pcr->StallScaleFactor); > - } > - else > - { > - /* Set StallScaleFactor to the default */ > - Pcr->StallScaleFactor = INITIAL_STALL_COUNT; > - } > - > -#if 0 > - /* For debugging */ > - ULONG i; > - > - DPRINT1("About to start delay loop test\n"); > - DPRINT1("Waiting for a minute..."); > - for (i = 0; i < (60*1000*20); i++) > - { > - KeStallExecutionProcessor(50); > - } > - DPRINT1("finished\n"); > - > - > - DPRINT1("About to start delay loop test\n"); > - DPRINT1("Waiting for a minute..."); > - for (i = 0; i < (60*1000); i++) > - { > - KeStallExecutionProcessor(1000); > - } > - DPRINT1("finished\n"); > - > - > - DPRINT1("About to start delay loop test\n"); > - DPRINT1("Waiting for a minute..."); > - for (i = 0; i < (60*1000*1000); i++) > - { > - KeStallExecutionProcessor(1); > - } > - DPRINT1("finished\n"); > - > - DPRINT1("About to start delay loop test\n"); > - DPRINT1("Waiting for a minute..."); > - KeStallExecutionProcessor(60*1000000); > - DPRINT1("finished\n"); > -#endif > -} > - > - > /* EOF */ > > _________________________________________________________________ Nuovo Windows 7: trova il PC più adatto alle tue esigenze. Scopri di più. http://windows.microsoft.com/shop

7 12

Re: [ros-dev] Re : [ros-diffs] [sginsberg] 43789: - Replace broken implementation of HalpCalibrateStallExecution with a new implementation by a mysterious HAL ninja and myself. The old implementation calculated the stall count factor incorrectly and
by Dmitry Gorbachev 27 Oct '09

27 Oct '09

I remember that atapi driver had the same problem (fixed in r26470). Perhaps uniata can be changed, too.

1 0

Re: [ros-dev] [ros-diffs] [janderwald] 43783: - Revert 43774
by Aleksey Bragin 26 Oct '09

26 Oct '09

why? On Oct 26, 2009, at 10:32 PM, janderwald(a)svn.reactos.org wrote: > Author: janderwald > Date: Mon Oct 26 20:32:25 2009 > New Revision: 43783 > > URL: http://svn.reactos.org/svn/reactos?rev=43783&view=rev > Log: > - Revert 43774 > > Removed: > trunk/reactos/dll/directx/dsound_new/ > >

1 0

Re: [ros-dev] [ros-diffs] [jimtabor] 43782: - Fix wine class test with a sync with wine edit.c.
by Ged Murphy 26 Oct '09

26 Oct '09

This looks weird, anyone know what's going on? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of jimtabor(a)svn.reactos.org Sent: 26 October 2009 18:27 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [jimtabor] 43782: - Fix wine class test with a sync with wine edit.c. Author: jimtabor Date: Mon Oct 26 19:26:48 2009 New Revision: 43782 URL: http://svn.reactos.org/svn/reactos?rev=43782&view=rev Log: - Fix wine class test with a sync with wine edit.c. 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] Mon Oct 26 19:26:48 2009 @@ -5533,7 +5533,11 @@ CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ +#ifdef _WIN64 sizeof(EDITSTATE *), /* extra */ +#else + sizeof(EDITSTATE *) + sizeof(WORD), /* extra */ +#endif IDC_IBEAM, /* cursor */ 0 /* brush */ };

2 1

Re: [ros-dev] [ros-diffs] [hyperion] 43753: "nslookup" branch for anakha, me and Z98, and whoever wants to follow the import of BIND nslookup
by Ged Murphy 26 Oct '09

26 Oct '09

A whole branch for a little command line tool? Am I missing something? This must be quite some tool :) -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of hyperion(a)svn.reactos.org Sent: 25 October 2009 20:43 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [hyperion] 43753: "nslookup" branch for anakha, me and Z98, and whoever wants to follow the import of BIND nslookup Author: hyperion Date: Sun Oct 25 21:43:02 2009 New Revision: 43753 URL: http://svn.reactos.org/svn/reactos?rev=43753&view=rev Log: "nslookup" branch for anakha, me and Z98, and whoever wants to follow the import of BIND nslookup Added: branches/nslookup/ (props changed) - copied from r43752, trunk/reactos/ Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 25 21:43:02 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/nslookup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/nslookup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 25 21:43:02 2009 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/nslookup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Oct 25 21:43:02 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Propchange: branches/nslookup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

2 1

Re: [ros-dev] [ros-diffs] [lsuggs] 43729: Starting clean to try something else.
by KJK::Hyperion 25 Oct '09

25 Oct '09

lsuggs(a)svn.reactos.org wrote: > Removed: > vendor/BIND/ Post-commit hook script strikes again!

1 0

Re: [ros-dev] [ros-diffs] [fireball] 43713: - Update arwinss to Wine-1.1.32. - 16 bit code is well isolated by Wine team now, so amount of differences is substantially smaller. Also more compatibility due to rewritten user32/resource.c.
by Steven Edwards 25 Oct '09

25 Oct '09

On Sat, Oct 24, 2009 at 9:20 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Sat Oct 24 15:20:16 2009 > New Revision: 43713 > > URL: http://svn.reactos.org/svn/reactos?rev=43713&view=rev > Log: > - Update arwinss to Wine-1.1.32. > - 16 bit code is well isolated by Wine team now, so amount of differences is substantially smaller. Also more compatibility due to rewritten user32/resource.c. I was wondering when Alexandre committed this if the new implementation of TranslateAccelerator magic could replace our implementation in trunk? It would be nice to not have multiple implementations of the same functionality floating around. -- 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] [lsuggs] 43700: First push of nslookup implementation.
by Alex Ionescu 24 Oct '09

24 Oct '09

Please revert this, it is implemented ass-half-backwards and does not use the correct DNSAPI services provided by Windows. Best regards, Alex Ionescu On Fri, Oct 23, 2009 at 7:25 PM, <lsuggs(a)svn.reactos.org> wrote: > Author: lsuggs > Date: Fri Oct 23 19:25:05 2009 > New Revision: 43700 > > URL: http://svn.reactos.org/svn/reactos?rev=43700&view=rev > Log: > First push of nslookup implementation. > > Added: > trunk/reactos/base/applications/network/nslookup/ (with props) > trunk/reactos/base/applications/network/nslookup/nslookup.c (with props) > trunk/reactos/base/applications/network/nslookup/nslookup.h (with props) > trunk/reactos/base/applications/network/nslookup/nslookup.rbuild (with props) > trunk/reactos/base/applications/network/nslookup/nslookup.rc (with props) > trunk/reactos/base/applications/network/nslookup/utility.c (with props) > Modified: > trunk/reactos/base/applications/network/network.rbuild > trunk/reactos/boot/bootdata/packages/reactos.dff > > Modified: trunk/reactos/base/applications/network/network.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/network.rbuild [iso-8859-1] (original) > +++ trunk/reactos/base/applications/network/network.rbuild [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -22,6 +22,9 @@ > <directory name="netstat"> > <xi:include href="netstat/netstat.rbuild" /> > </directory> > + <directory name="nslookup"> > + <xi:include href="nslookup/nslookup.rbuild" /> > + </directory> > <directory name="ping"> > <xi:include href="ping/ping.rbuild" /> > </directory> > > Propchange: trunk/reactos/base/applications/network/nslookup/ > ------------------------------------------------------------------------------ > --- bugtraq:logregex (added) > +++ bugtraq:logregex Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,2 @@ > +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? > +(\d+) > > Propchange: trunk/reactos/base/applications/network/nslookup/ > ------------------------------------------------------------------------------ > bugtraq:message = See issue #%BUGID% for more details. > > Propchange: trunk/reactos/base/applications/network/nslookup/ > ------------------------------------------------------------------------------ > bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% > > Propchange: trunk/reactos/base/applications/network/nslookup/ > ------------------------------------------------------------------------------ > tsvn:logminsize = 10 > > Added: trunk/reactos/base/applications/network/nslookup/nslookup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/nslookup/nslookup.c (added) > +++ trunk/reactos/base/applications/network/nslookup/nslookup.c [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,858 @@ > +/* > + * PROJECT: ReactOS nslookup utility > + * LICENSE: GPL - See COPYING in the top level directory > + * FILE: applications/network/nslookup/nslookup.c > + * PURPOSE: Perform DNS lookups > + * COPYRIGHT: Copyright 2009 Lucas Suggs <lucas.suggs(a)gmail.com> > + */ > + > +#include <windows.h> > +#include <windns.h> > +#include <winsock2.h> > +#include <tchar.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <iphlpapi.h> > +#include "nslookup.h" > + > +STATE State; > +HANDLE ProcessHeap; > +ULONG RequestID; > + > +void PrintState() > +{ > + _tprintf( _T("Default Server: (null)\n\n") ); > + _tprintf( _T("Set options:\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.debug ) _tprintf( _T("no") ); > + _tprintf( _T("debug\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.defname ) _tprintf( _T("no") ); > + _tprintf( _T("defname\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.search ) _tprintf( _T("no") ); > + _tprintf( _T("search\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.recurse ) _tprintf( _T("no") ); > + _tprintf( _T("recurse\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.d2 ) _tprintf( _T("no") ); > + _tprintf( _T("d2\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.vc ) _tprintf( _T("no") ); > + _tprintf( _T("vc\n") ); > + > + _tprintf( _T(" ") ); > + if( !State.ignoretc ) _tprintf( _T("no") ); > + _tprintf( _T("ignoretc\n") ); > + > + _tprintf( _T(" port=%d\n"), State.port ); > + _tprintf( _T(" type=%s\n"), State.type ); > + _tprintf( _T(" class=%s\n"), State.Class ); > + _tprintf( _T(" timeout=%d\n"), (int)State.timeout ); > + _tprintf( _T(" retry=%d\n"), (int)State.retry ); > + _tprintf( _T(" root=%s\n"), State.root ); > + _tprintf( _T(" domain=%s\n"), State.domain ); > + > + _tprintf( _T(" ") ); > + if( !State.MSxfr ) _tprintf( _T("no") ); > + _tprintf( _T("MSxfr\n") ); > + > + _tprintf( _T(" IXFRversion=%d\n"), (int)State.ixfrver ); > + > + _tprintf( _T(" srchlist=%s\n\n"), State.srchlist[0] ); > +} > + > +void PrintUsage() > +{ > + _tprintf( _T("Usage:\n" > + " nslookup [-opt ...] # interactive mode using" > + " default server\n nslookup [-opt ...] - server #" > + " interactive mode using 'server'\n nslookup [-opt ...]" > + " host # just look up 'host' using default server\n" > + " nslookup [-opt ...] host server # just look up 'host'" > + " using 'server'\n") ); > +} > + > +BOOL PerformInternalLookup( PCHAR pAddr, PCHAR pResult ) > +{ > + /* Needed to issue DNS packets and parse them. */ > + PCHAR Buffer = NULL, RecBuffer = NULL; > + CHAR pResolve[256]; > + ULONG BufferLength = 0, RecBufferLength = 512; > + int i = 0, j = 0, k = 0, d = 0; > + BOOL bOk = FALSE; > + > + /* Makes things easier when parsing the response packet. */ > + UCHAR Header1, Header2; > + USHORT NumQuestions; > + USHORT NumAnswers; > + USHORT NumAuthority; > + USHORT NumAdditional; > + USHORT Type; > + > + if( (strlen( pAddr ) + 1) > 255 ) return FALSE; > + > + Type = TYPE_A; > + if( IsValidIP( pAddr ) ) Type = TYPE_PTR; > + > + /* If it's a PTR lookup then append the ARPA sig to the end. */ > + if( Type == TYPE_PTR ) > + { > + ReverseIP( pAddr, pResolve ); > + strcat( pResolve, ARPA_SIG ); > + } > + else > + { > + strcpy( pResolve, pAddr ); > + } > + > + /* Base header length + length of QNAME + length of QTYPE and QCLASS */ > + BufferLength = 12 + (strlen( pResolve ) + 2) + 4; > + > + /* Allocate memory for the buffer. */ > + Buffer = HeapAlloc( ProcessHeap, 0, BufferLength ); > + if( !Buffer ) > + { > + _tprintf( _T("ERROR: Out of memory\n") ); > + goto cleanup; > + } > + > + /* Allocate the receiving buffer. */ > + RecBuffer = HeapAlloc( ProcessHeap, 0, RecBufferLength ); > + if( !RecBuffer ) > + { > + _tprintf( _T("ERROR: Out of memory\n") ); > + goto cleanup; > + } > + > + /* Insert the ID field. */ > + ((PSHORT)&Buffer[i])[0] = htons( RequestID ); > + i += 2; > + > + /* Bits 0-7 of the second 16 are all 0, except for when recursion is > + desired. */ > + Buffer[i] = 0x00; > + if( State.recurse) Buffer[i] |= 0x01; > + i += 1; > + > + /* Bits 8-15 of the second 16 are 0 for a query. */ > + Buffer[i] = 0x00; > + i += 1; > + > + /* Only 1 question. */ > + ((PSHORT)&Buffer[i])[0] = htons( 1 ); > + i += 2; > + > + /* We aren't sending a response, so 0 out the rest of the header. */ > + Buffer[i] = 0x00; > + Buffer[i + 1] = 0x00; > + Buffer[i + 2] = 0x00; > + Buffer[i + 3] = 0x00; > + Buffer[i + 4] = 0x00; > + Buffer[i + 5] = 0x00; > + i += 6; > + > + /* Walk through the query address. Split each section delimited by '.'. > + Format of the QNAME section is length|data, etc. Last one is null */ > + j = i; > + i += 1; > + > + for( k = 0; k < strlen( pResolve ); k += 1 ) > + { > + if( pResolve[k] != '.' ) > + { > + Buffer[i] = pResolve[k]; > + i += 1; > + } > + else > + { > + Buffer[j] = (i - j) - 1; > + j = i; > + i += 1; > + } > + } > + > + Buffer[j] = (i - j) - 1; > + Buffer[i] = 0x00; > + i += 1; > + > + /* QTYPE */ > + ((PSHORT)&Buffer[i])[0] = htons( Type ); > + i += 2; > + > + /* QCLASS */ > + ((PSHORT)&Buffer[i])[0] = htons( CLASS_IN ); > + > + /* Ship the request off to the DNS server. */ > + bOk = SendRequest( Buffer, > + BufferLength, > + RecBuffer, > + &RecBufferLength ); > + if( !bOk ) goto cleanup; > + > + /* Start parsing the received packet. */ > + Header1 = RecBuffer[2]; > + Header2 = RecBuffer[3]; > + NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] ); > + NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] ); > + NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] ); > + NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] ); > + > + k = 12; > + > + /* We don't care about the questions section, blow through it. */ > + if( NumQuestions ) > + { > + for( i = 0; i < NumQuestions; i += 1 ) > + { > + /* Quick way to skip the domain name section. */ > + k += ExtractName( RecBuffer, pResult, k, 0 ); > + k += 4; > + } > + } > + > + /* Skip the answer name. */ > + k += ExtractName( RecBuffer, pResult, k, 0 ); > + > + Type = ntohs( ((PUSHORT)&RecBuffer[k])[0] ); > + k += 8; > + > + d = ntohs( ((PUSHORT)&RecBuffer[k])[0] ); > + k += 2; > + > + if( TYPE_PTR == Type ) > + { > + k += ExtractName( RecBuffer, pResult, k, d ); > + } > + else if( TYPE_A == Type ) > + { > + k += ExtractIP( RecBuffer, pResult, k ); > + } > + > +cleanup: > + /* Free memory. */ > + if( Buffer ) HeapFree( ProcessHeap, 0, Buffer ); > + if( RecBuffer ) HeapFree( ProcessHeap, 0, RecBuffer ); > + > + RequestID += 1; > + > + return bOk; > +} > + > +void PerformLookup( PCHAR pAddr ) > +{ > + /* Needed to issue DNS packets and parse them. */ > + PCHAR Buffer = NULL, RecBuffer = NULL; > + CHAR pResolve[256]; > + CHAR pResult[256]; > + ULONG BufferLength = 0, RecBufferLength = 512; > + int i = 0, j = 0, k = 0, d = 0; > + BOOL bOk = FALSE; > + > + /* Makes things easier when parsing the response packet. */ > + UCHAR Header1, Header2; > + USHORT NumQuestions; > + USHORT NumAnswers; > + USHORT NumAuthority; > + USHORT NumAdditional; > + USHORT Type; > + > + if( (strlen( pAddr ) + 1) > 255 ) return; > + > + _tprintf( _T("Server: %s\n"), State.DefaultServer ); > + _tprintf( _T("Address: %s\n\n"), State.DefaultServerAddress ); > + > + if( !strcmp( TypeA, State.type ) > + || !strcmp( TypeAAAA, State.type ) > + || !strcmp( TypeBoth, State.type ) ) > + { > + Type = TYPE_A; > + if( IsValidIP( pAddr ) ) Type = TYPE_PTR; > + } > + else > + Type = TypeNametoTypeID( State.type ); > + > + /* If it's a PTR lookup then append the ARPA sig to the end. */ > + if( (Type == TYPE_PTR) && IsValidIP( pAddr ) ) > + { > + ReverseIP( pAddr, pResolve ); > + strcat( pResolve, ARPA_SIG ); > + } > + else > + { > + strcpy( pResolve, pAddr ); > + } > + > + /* Base header length + length of QNAME + length of QTYPE and QCLASS */ > + BufferLength = 12 + (strlen( pResolve ) + 2) + 4; > + > + /* Allocate memory for the buffer. */ > + Buffer = HeapAlloc( ProcessHeap, 0, BufferLength ); > + if( !Buffer ) > + { > + _tprintf( _T("ERROR: Out of memory\n") ); > + goto cleanup; > + } > + > + /* Allocate memory for the return buffer. */ > + RecBuffer = HeapAlloc( ProcessHeap, 0, RecBufferLength ); > + if( !RecBuffer ) > + { > + _tprintf( _T("ERROR: Out of memory\n") ); > + goto cleanup; > + } > + > + /* Insert the ID field. */ > + ((PSHORT)&Buffer[i])[0] = htons( RequestID ); > + i += 2; > + > + /* Bits 0-7 of the second 16 are all 0, except for when recursion is > + desired. */ > + Buffer[i] = 0x00; > + if( State.recurse) Buffer[i] |= 0x01; > + i += 1; > + > + /* Bits 8-15 of the second 16 are 0 for a query. */ > + Buffer[i] = 0x00; > + i += 1; > + > + /* Only 1 question. */ > + ((PSHORT)&Buffer[i])[0] = htons( 1 ); > + i += 2; > + > + /* We aren't sending a response, so 0 out the rest of the header. */ > + Buffer[i] = 0x00; > + Buffer[i + 1] = 0x00; > + Buffer[i + 2] = 0x00; > + Buffer[i + 3] = 0x00; > + Buffer[i + 4] = 0x00; > + Buffer[i + 5] = 0x00; > + i += 6; > + > + /* Walk through the query address. Split each section delimited by '.'. > + Format of the QNAME section is length|data, etc. Last one is null */ > + j = i; > + i += 1; > + > + for( k = 0; k < strlen( pResolve ); k += 1 ) > + { > + if( pResolve[k] != '.' ) > + { > + Buffer[i] = pResolve[k]; > + i += 1; > + } > + else > + { > + Buffer[j] = (i - j) - 1; > + j = i; > + i += 1; > + } > + } > + > + Buffer[j] = (i - j) - 1; > + Buffer[i] = 0x00; > + i += 1; > + > + /* QTYPE */ > + ((PSHORT)&Buffer[i])[0] = htons( Type ); > + i += 2; > + > + /* QCLASS */ > + ((PSHORT)&Buffer[i])[0] = htons( ClassNametoClassID( State.Class ) ); > + > + /* Ship off the request to the DNS server. */ > + bOk = SendRequest( Buffer, > + BufferLength, > + RecBuffer, > + &RecBufferLength ); > + if( !bOk ) goto cleanup; > + > + /* Start parsing the received packet. */ > + Header1 = RecBuffer[2]; > + Header2 = RecBuffer[3]; > + NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] ); > + NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] ); > + NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] ); > + NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] ); > + Type = 0; > + > + /* Check the RCODE for failure. */ > + d = Header2 & 0x0F; > + if( d != RCODE_NOERROR ) > + { > + switch( d ) > + { > + case RCODE_NXDOMAIN: > + _tprintf( _T("*** %s can't find %s: Non-existant domain\n"), State.DefaultServer, pAddr ); > + break; > + > + case RCODE_REFUSED: > + _tprintf( _T("*** %s can't find %s: Query refused\n"), State.DefaultServer, pAddr ); > + break; > + > + default: > + _tprintf( _T("*** %s can't find %s: Unknown RCODE\n"), State.DefaultServer, pAddr ); > + } > + > + goto cleanup; > + } > + > + k = 12; > + > + if( NumQuestions ) > + { > + /* Blow through the questions section since we don't care about it. */ > + for( i = 0; i < NumQuestions; i += 1 ) > + { > + k += ExtractName( RecBuffer, pResult, k, 0 ); > + k += 4; > + } > + } > + > + if( NumAnswers ) > + { > + /* Skip the name. */ > + k += ExtractName( RecBuffer, pResult, k, 0 ); > + > + Type = ntohs( ((PUSHORT)&RecBuffer[k])[0] ); > + k += 8; > + > + d = ntohs( ((PUSHORT)&RecBuffer[k])[0] ); > + k += 2; > + > + if( TYPE_PTR == Type ) > + { > + k += ExtractName( RecBuffer, pResult, k, d ); > + } > + else if( TYPE_A == Type ) > + { > + k += ExtractIP( RecBuffer, pResult, k ); > + } > + } > + > + /* FIXME: This'll need to support more than PTR and A at some point. */ > + if( !strcmp( State.type, TypePTR ) ) > + { > + if( TYPE_PTR == Type ) > + { > + _tprintf( _T("%s name = %s\n"), pResolve, pResult ); > + } > + else > + { > + } > + } > + else if( !strcmp( State.type, TypeA ) > + || !strcmp( State.type, TypeAAAA ) > + || !strcmp( State.type, TypeBoth ) ) > + { > + if( (TYPE_A == Type) /*|| (TYPE_AAAA == Type)*/ ) > + { > + if( 0 == NumAuthority ) > + _tprintf( _T("Non-authoritative answer:\n") ); > + > + _tprintf( _T("Name: %s\n"), pAddr ); > + _tprintf( _T("Address: %s\n\n"), pResult ); > + } > + else > + { > + _tprintf( _T("Name: %s\n"), pResult ); > + _tprintf( _T("Address: %s\n\n"), pAddr ); > + } > + } > + > +cleanup: > + /* Free memory. */ > + if( Buffer ) HeapFree( ProcessHeap, 0, Buffer ); > + if( RecBuffer ) HeapFree( ProcessHeap, 0, RecBuffer ); > + > + RequestID += 1; > +} > + > +BOOL ParseCommandLine( int argc, char* argv[] ) > +{ > + int i; > + BOOL NoMoreOptions = FALSE; > + BOOL Interactive = FALSE; > + CHAR AddrToResolve[256]; > + CHAR Server[256]; > + > + RtlZeroMemory( AddrToResolve, 256 ); > + RtlZeroMemory( Server, 256 ); > + > + if( 2 == argc ) > + { > + /* In the Windows nslookup, usage is only displayed if /? is the only > + option specified on the command line. */ > + if( !strncmp( "/?", argv[1], 2 ) ) > + { > + PrintUsage(); > + return 0; > + } > + } > + > + if( argc > 1 ) > + { > + for( i = 1; i < argc; i += 1 ) > + { > + if( NoMoreOptions ) > + { > + strncpy( Server, argv[i], 255 ); > + > + /* Determine which one to resolve. This is based on whether the > + DNS server provided was an IP or an FQDN. */ > + if( IsValidIP( Server ) ) > + { > + strncpy( State.DefaultServerAddress, Server, 16 ); > + > + PerformInternalLookup( State.DefaultServerAddress, > + State.DefaultServer ); > + } > + else > + { > + strncpy( State.DefaultServer, Server, 255 ); > + > + PerformInternalLookup( State.DefaultServer, > + State.DefaultServerAddress ); > + } > + > + if( Interactive ) return 1; > + > + PerformLookup( AddrToResolve ); > + > + return 0; > + } > + else > + { > + if( !strncmp( "-all", argv[i], 4 ) ) > + { > + PrintState(); > + } > + else if( !strncmp( "-type=", argv[i], 6 ) ) > + { > + if( !strncmp( TypeA, &argv[i][6], strlen( TypeA ) ) ) > + { > + State.type = TypeA; > + } > + else if( !strncmp( TypeAAAA, &argv[i][6], strlen( TypeAAAA ) ) ) > + { > + State.type = TypeAAAA; > + } > + else if( !strncmp( TypeBoth, &argv[i][6], strlen( TypeBoth ) ) ) > + { > + State.type = TypeBoth; > + } > + else if( !strncmp( TypeAny, &argv[i][6], strlen( TypeAny ) ) ) > + { > + State.type = TypeAny; > + } > + else if( !strncmp( TypeCNAME, &argv[i][6], strlen( TypeCNAME ) ) ) > + { > + State.type = TypeCNAME; > + } > + else if( !strncmp( TypeMX, &argv[i][6], strlen( TypeMX ) ) ) > + { > + State.type = TypeMX; > + } > + else if( !strncmp( TypeNS, &argv[i][6], strlen( TypeNS ) ) ) > + { > + State.type = TypeNS; > + } > + else if( !strncmp( TypePTR, &argv[i][6], strlen( TypePTR ) ) ) > + { > + State.type = TypePTR; > + } > + else if( !strncmp( TypeSOA, &argv[i][6], strlen( TypeSOA ) ) ) > + { > + State.type = TypeSOA; > + } > + else if( !strncmp( TypeSRV, &argv[i][6], strlen( TypeSRV ) ) ) > + { > + State.type = TypeSRV; > + } > + else > + { > + _tprintf( _T("unknown query type: %s"), &argv[i][6] ); > + } > + } > + else if( !strncmp( "-domain=", argv[i], 8 ) ) > + { > + strcpy( State.domain, &argv[i][8] ); > + } > + else if( !strncmp( "-srchlist=", argv[i], 10 ) ) > + { > + } > + else if( !strncmp( "-root=", argv[i], 6 ) ) > + { > + strcpy( State.root, &argv[i][6] ); > + } > + else if( !strncmp( "-retry=", argv[i], 7 ) ) > + { > + } > + else if( !strncmp( "-timeout=", argv[i], 9 ) ) > + { > + } > + else if( !strncmp( "-querytype=", argv[i], 11 ) ) > + { > + if( !strncmp( TypeA, &argv[i][11], strlen( TypeA ) ) ) > + { > + State.type = TypeA; > + } > + else if( !strncmp( TypeAAAA, &argv[i][11], strlen( TypeAAAA ) ) ) > + { > + State.type = TypeAAAA; > + } > + else if( !strncmp( TypeBoth, &argv[i][11], strlen( TypeBoth ) ) ) > + { > + State.type = TypeBoth; > + } > + else if( !strncmp( TypeAny, &argv[i][11], strlen( TypeAny ) ) ) > + { > + State.type = TypeAny; > + } > + else if( !strncmp( TypeCNAME, &argv[i][11], strlen( TypeCNAME ) ) ) > + { > + State.type = TypeCNAME; > + } > + else if( !strncmp( TypeMX, &argv[i][11], strlen( TypeMX ) ) ) > + { > + State.type = TypeMX; > + } > + else if( !strncmp( TypeNS, &argv[i][11], strlen( TypeNS ) ) ) > + { > + State.type = TypeNS; > + } > + else if( !strncmp( TypePTR, &argv[i][11], strlen( TypePTR ) ) ) > + { > + State.type = TypePTR; > + } > + else if( !strncmp( TypeSOA, &argv[i][11], strlen( TypeSOA ) ) ) > + { > + State.type = TypeSOA; > + } > + else if( !strncmp( TypeSRV, &argv[i][11], strlen( TypeSRV ) ) ) > + { > + State.type = TypeSRV; > + } > + else > + { > + _tprintf( _T("unknown query type: %s"), &argv[i][6] ); > + } > + } > + else if( !strncmp( "-class=", argv[i], 7 ) ) > + { > + if( !strncmp( ClassIN, &argv[i][7], strlen( ClassIN ) ) ) > + { > + State.Class = ClassIN; > + } > + else if( !strncmp( ClassAny, &argv[i][7], strlen( ClassAny ) ) ) > + { > + State.Class = ClassAny; > + } > + else > + { > + _tprintf( _T("unknown query class: %s"), &argv[i][7] ); > + } > + } > + else if( !strncmp( "-ixfrver=", argv[i], 9 ) ) > + { > + } > + else if( !strncmp( "-debug", argv[i], 6 ) ) > + { > + State.debug = TRUE; > + } > + else if( !strncmp( "-nodebug", argv[i], 8 ) ) > + { > + State.debug = FALSE; > + State.d2 = FALSE; > + } > + else if( !strncmp( "-d2", argv[i], 3 ) ) > + { > + State.d2 = TRUE; > + State.debug = TRUE; > + } > + else if( !strncmp( "-nod2", argv[i], 5 ) ) > + { > + if( State.debug ) _tprintf( _T("d2 mode disabled; still in debug mode\n") ); > + > + State.d2 = FALSE; > + } > + else if( !strncmp( "-defname", argv[i], 8 ) ) > + { > + State.defname = TRUE; > + } > + else if( !strncmp( "-noddefname", argv[i], 10 ) ) > + { > + State.defname = FALSE; > + } > + else if( !strncmp( "-recurse", argv[i], 8 ) ) > + { > + State.recurse = TRUE; > + } > + else if( !strncmp( "-norecurse", argv[i], 10 ) ) > + { > + State.recurse = FALSE; > + } > + else if( !strncmp( "-search", argv[i], 7 ) ) > + { > + State.search = TRUE; > + } > + else if( !strncmp( "-nosearch", argv[i], 9 ) ) > + { > + State.search = FALSE; > + } > + else if( !strncmp( "-vc", argv[i], 3 ) ) > + { > + State.vc = TRUE; > + } > + else if( !strncmp( "-novc", argv[i], 5 ) ) > + { > + State.vc = FALSE; > + } > + else if( !strncmp( "-msxfr", argv[i], 6 ) ) > + { > + State.MSxfr = TRUE; > + } > + else if( !strncmp( "-nomsxfr", argv[i], 8 ) ) > + { > + State.MSxfr = FALSE; > + } > + else if( !strncmp( "-", argv[i], 1 ) && (strlen( argv[i] ) == 1) ) > + { > + /* Since we received just the plain - switch, we are going > + to be entering interactive mode. We also will not be > + parsing any more options. */ > + NoMoreOptions = TRUE; > + Interactive = TRUE; > + } > + else > + { > + /* Grab the address to resolve. No more options accepted > + past this point. */ > + strncpy( AddrToResolve, argv[i], 255 ); > + NoMoreOptions = TRUE; > + } > + } > + } > + > + if( NoMoreOptions && !Interactive ) > + { > + /* Get the FQDN of the DNS server. */ > + PerformInternalLookup( State.DefaultServerAddress, > + State.DefaultServer ); > + > + PerformLookup( AddrToResolve ); > + > + return 0; > + } > + } > + > + /* Get the FQDN of the DNS server. */ > + PerformInternalLookup( State.DefaultServerAddress, > + State.DefaultServer ); > + > + return 1; > +} > + > +void InteractiveMode() > +{ > + _tprintf( _T("Default Server: %s\n"), State.DefaultServer ); > + _tprintf( _T("Address: %s\n\n"), State.DefaultServerAddress ); > + > + /* TODO: Implement interactive mode. */ > + > + _tprintf( _T("ERROR: Feature not implemented.\n") ); > +} > + > +int main( int argc, char* argv[] ) > +{ > + int i; > + ULONG Status; > + PFIXED_INFO pNetInfo = NULL; > + ULONG NetBufLen = 0; > + WSADATA wsaData; > + > + ProcessHeap = GetProcessHeap(); > + RequestID = 1; > + > + /* Set up the initial state. */ > + State.debug = FALSE; > + State.defname = TRUE; > + State.search = TRUE; > + State.recurse = TRUE; > + State.d2 = FALSE; > + State.vc = FALSE; > + State.ignoretc = FALSE; > + State.port = 53; > + State.type = TypeBoth; > + State.Class = ClassIN; > + State.timeout = 2; > + State.retry = 1; > + State.MSxfr = TRUE; > + State.ixfrver = 1; > + > + RtlZeroMemory( State.root, 256 ); > + RtlZeroMemory( State.domain, 256 ); > + for( i = 0; i < 6; i += 1 ) RtlZeroMemory( State.srchlist[i], 256 ); > + RtlZeroMemory( State.DefaultServer, 256 ); > + RtlZeroMemory( State.DefaultServerAddress, 16 ); > + > + strncpy( State.root, DEFAULT_ROOT, strlen( DEFAULT_ROOT ) ); > + > + /* We don't know how long of a buffer it will want to return. So we'll > + pass an empty one now and let it fail only once, instead of guessing. */ > + Status = GetNetworkParams( pNetInfo, &NetBufLen ); > + if( Status == ERROR_BUFFER_OVERFLOW ) > + { > + pNetInfo = (PFIXED_INFO)HeapAlloc( ProcessHeap, 0, NetBufLen ); > + if( pNetInfo == NULL ) > + { > + _tprintf( _T("ERROR: Out of memory\n") ); > + > + return -1; > + } > + > + /* For real this time. */ > + Status = GetNetworkParams( pNetInfo, &NetBufLen ); > + if( Status != NO_ERROR ) > + { > + _tprintf( _T("Error in GetNetworkParams call\n") ); > + > + HeapFree( ProcessHeap, 0, pNetInfo ); > + > + return -2; > + } > + } > + > + strncpy( State.domain, pNetInfo->DomainName, 255 ); > + strncpy( State.srchlist[0], pNetInfo->DomainName, 255 ); > + strncpy( State.DefaultServerAddress, > + pNetInfo->DnsServerList.IpAddress.String, > + 15 ); > + > + HeapFree( ProcessHeap, 0, pNetInfo ); > + > + WSAStartup( MAKEWORD(2,2), &wsaData ); > + > + switch( ParseCommandLine( argc, argv ) ) > + { > + case 0: > + /* This means that it was a /? parameter. */ > + break; > + > + default: > + /* Anything else means we enter interactive mode. The only exception > + to this is when the host to resolve was provided on the command > + line. */ > + InteractiveMode(); > + } > + > + WSACleanup(); > + return 0; > +} > > Propchange: trunk/reactos/base/applications/network/nslookup/nslookup.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/network/nslookup/nslookup.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/nslookup/nslookup.h (added) > +++ trunk/reactos/base/applications/network/nslookup/nslookup.h [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,104 @@ > +#define TypeA "A" > +#define TypeAAAA "AAAA" > +#define TypeBoth "A+AAAA" > +#define TypeAny "ANY" > +#define TypeCNAME "CNAME" > +#define TypeMX "MX" > +#define TypeNS "NS" > +#define TypePTR "PTR" > +#define TypeSOA "SOA" > +#define TypeSRV "SRV" > + > +#define TYPE_A 0x01 > +#define TYPE_NS 0x02 > +#define TYPE_CNAME 0x05 > +#define TYPE_SOA 0x06 > +#define TYPE_WKS 0x0B > +#define TYPE_PTR 0x0C > +#define TYPE_MX 0x0F > +#define TYPE_ANY 0xFF > + > +#define ClassIN "IN" > +#define ClassAny "ANY" > + > +#define CLASS_IN 0x01 > +#define CLASS_ANY 0xFF > + > +#define OPCODE_QUERY 0x00 > +#define OPCODE_IQUERY 0x01 > +#define OPCODE_STATUS 0x02 > + > +#define OpcodeQuery "QUERY" > +#define OpcodeIQuery "IQUERY" > +#define OpcodeStatus "STATUS" > +#define OpcodeReserved "RESERVED" > + > +#define RCODE_NOERROR 0x00 > +#define RCODE_FORMERR 0x01 > +#define RCODE_FAILURE 0x02 > +#define RCODE_NXDOMAIN 0x03 > +#define RCODE_NOTIMP 0x04 > +#define RCODE_REFUSED 0x05 > + > +#define RCodeNOERROR "NOERROR" > +#define RCodeFORMERR "FORMERR" > +#define RCodeFAILURE "FAILURE" > +#define RCodeNXDOMAIN "NXDOMAIN" > +#define RCodeNOTIMP "NOTIMP" > +#define RCodeREFUSED "REFUSED" > +#define RCodeReserved "RESERVED" > + > +#define DEFAULT_ROOT "A.ROOT-SERVERS.NET." > +#define ARPA_SIG ".in-addr.arpa" > + > +typedef struct _STATE > +{ > + BOOL debug; > + BOOL defname; > + BOOL d2; > + BOOL recurse; > + BOOL search; > + BOOL vc; > + BOOL ignoretc; > + BOOL MSxfr; > + CHAR domain[256]; > + CHAR srchlist[6][256]; > + CHAR root[256]; > + DWORD retry; > + DWORD timeout; > + DWORD ixfrver; > + PCHAR type; > + PCHAR Class; > + USHORT port; > + CHAR DefaultServer[256]; > + CHAR DefaultServerAddress[16]; > +} STATE, *PSTATE; > + > +/* nslookup.c */ > + > +extern STATE State; > +extern HANDLE ProcessHeap; > + > +/* utility.c */ > + > +BOOL SendRequest( PCHAR pInBuffer, > + ULONG InBufferLength, > + PCHAR pOutBuffer, > + PULONG pOutBufferLength ); > + > +int ExtractName( PCHAR pBuffer, > + PCHAR pOutput, > + USHORT Offset, > + UCHAR Limit ); > + > +void ReverseIP( PCHAR pIP, PCHAR pReturn ); > +BOOL IsValidIP( PCHAR pInput ); > +int ExtractIP( PCHAR pBuffer, PCHAR pOutput, USHORT Offset ); > +void PrintD2( PCHAR pBuffer, DWORD BufferLength ); > +void PrintDebug( PCHAR pBuffer, DWORD BufferLength ); > +PCHAR OpcodeIDtoOpcodeName( UCHAR Opcode ); > +PCHAR RCodeIDtoRCodeName( UCHAR RCode ); > +PCHAR TypeIDtoTypeName( USHORT TypeID ); > +USHORT TypeNametoTypeID( PCHAR TypeName ); > +PCHAR ClassIDtoClassName( USHORT ClassID ); > +USHORT ClassNametoClassID( PCHAR ClassName ); > > Propchange: trunk/reactos/base/applications/network/nslookup/nslookup.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/network/nslookup/nslookup.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/nslookup/nslookup.rbuild (added) > +++ trunk/reactos/base/applications/network/nslookup/nslookup.rbuild [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,13 @@ > +<?xml version="1.0"?> > +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> > +<module name="nslookup" type="win32cui" installbase="system32" installname="nslookup.exe"> > + <include base="nslookup">.</include> > + <library>kernel32</library> > + <library>user32</library> > + <library>ws2_32</library> > + <library>snmpapi</library> > + <library>iphlpapi</library> > + <file>nslookup.c</file> > + <file>utility.c</file> > + <file>nslookup.rc</file> > +</module> > > Propchange: trunk/reactos/base/applications/network/nslookup/nslookup.rbuild > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/network/nslookup/nslookup.rc > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/nslookup/nslookup.rc (added) > +++ trunk/reactos/base/applications/network/nslookup/nslookup.rc [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,5 @@ > +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 nslookup\0" > +#define REACTOS_STR_INTERNAL_NAME "nslookup\0" > +#define REACTOS_STR_ORIGINAL_FILENAME "nslookup.exe\0" > +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Lucas Suggs (lucas.suggs(a)gmail.com)\0" > +#include <reactos/version.rc> > > Propchange: trunk/reactos/base/applications/network/nslookup/nslookup.rc > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/base/applications/network/nslookup/utility.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… > ============================================================================== > --- trunk/reactos/base/applications/network/nslookup/utility.c (added) > +++ trunk/reactos/base/applications/network/nslookup/utility.c [iso-8859-1] Fri Oct 23 19:25:05 2009 > @@ -1,0 +1,852 @@ > +/* > + * PROJECT: ReactOS nslookup utility > + * LICENSE: GPL - See COPYING in the top level directory > + * FILE: applications/network/nslookup/utility.c > + * PURPOSE: Support functions for nslookup.c > + * COPYRIGHT: Copyright 2009 Lucas Suggs <lucas.suggs(a)gmail.com> > + */ > + > +#include <windows.h> > +#include <tchar.h> > +#include <stdio.h> > +#include "nslookup.h" > + > +BOOL SendRequest( PCHAR pInBuffer, > + ULONG InBufferLength, > + PCHAR pOutBuffer, > + PULONG pOutBufferLength ) > +{ > + int j; > + USHORT RequestID, ResponseID; > + BOOL bWait; > + SOCKET s; > + SOCKADDR_IN RecAddr, RecAddr2, SendAddr; > + int SendAddrLen = sizeof(SendAddr); > + > + RtlZeroMemory( &RecAddr, sizeof(SOCKADDR_IN) ); > + RtlZeroMemory( &RecAddr2, sizeof(SOCKADDR_IN) ); > + RtlZeroMemory( &SendAddr, sizeof(SOCKADDR_IN) ); > + > + /* Pull the request ID from the buffer. */ > + RequestID = ntohs( ((PSHORT)&pInBuffer[0])[0] ); > + > + /* If D2 flags is enabled, then display D2 information. */ > + if( State.d2 ) PrintD2( pInBuffer, InBufferLength ); > + > + /* Create the sockets for both send and receive. */ > + s = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); > + > + /* Set up the structure to tell it where we are going. */ > + RecAddr.sin_family = AF_INET; > + RecAddr.sin_port = htons( State.port ); > + RecAddr.sin_addr.s_addr = inet_addr( State.DefaultServerAddress ); > + > + /* Set up the structure to tell it what port to listen on. */ > + RecAddr2.sin_family = AF_INET; > + RecAddr2.sin_port = htons( State.port ); > + RecAddr2.sin_addr.s_addr = htonl( INADDR_ANY ); > + > + /* Bind the receive socket. */ > + bind( s, (SOCKADDR*)&RecAddr2, sizeof(RecAddr2) ); > + > + /* Send the datagram to the DNS server. */ > + j = sendto( s, > + pInBuffer, > + InBufferLength, > + 0, > + (SOCKADDR*)&RecAddr, > + sizeof(RecAddr) ); > + if( j == SOCKET_ERROR ) > + { > + switch( WSAGetLastError() ) > + { > + case WSANOTINITIALISED: > + _tprintf( _T("sendto() failed with WSANOTINITIALIZED\n") ); > + break; > + case WSAENETDOWN: > + _tprintf( _T("sendto() failed with WSAENETDOWN\n") ); > + break; > + case WSAEACCES: > + _tprintf( _T("sendto() failed with WSAEACCES\n") ); > + break; > + case WSAEINVAL: > + _tprintf( _T("sendto() failed with WSAEINVAL\n") ); > + break; > + case WSAEINTR: > + _tprintf( _T("sendto() failed with WSAEINTR\n") ); > + break; > + case WSAEINPROGRESS: > + _tprintf( _T("sendto() failed with WSAEINPROGRESS\n") ); > + break; > + case WSAEFAULT: > + _tprintf( _T("sendto() failed with WSAEFAULT\n") ); > + break; > + case WSAENETRESET: > + _tprintf( _T("sendto() failed with WSAENETRESET\n") ); > + break; > + case WSAENOBUFS: > + _tprintf( _T("sendto() failed with WSAENOBUFS\n") ); > + break; > + case WSAENOTCONN: > + _tprintf( _T("sendto() failed with WSAENOTCONN\n") ); > + break; > + case WSAENOTSOCK: > + _tprintf( _T("sendto() failed with WSAENOTSOCK\n") ); > + break; > + case WSAEOPNOTSUPP: > + _tprintf( _T("sendto() failed with WSAEOPNOTSUPP\n") ); > + break; > + case WSAESHUTDOWN: > + _tprintf( _T("sendto() failed with WSAESHUTDOWN\n") ); > + break; > + case WSAEWOULDBLOCK: > + _tprintf( _T("sendto() failed with WSAEWOULDBLOCK\n") ); > + break; > + case WSAEMSGSIZE: > + _tprintf( _T("sendto() failed with WSAEMSGSIZE\n") ); > + break; > + case WSAEHOSTUNREACH: > + _tprintf( _T("sendto() failed with WSAEHOSTUNREACH\n") ); > + break; > + case WSAECONNABORTED: > + _tprintf( _T("sendto() failed with WSAECONNABORTED\n") ); > + break; > + case WSAECONNRESET: > + _tprintf( _T("sendto() failed with WSAECONNRESET\n") ); > + break; > + case WSAEADDRNOTAVAIL: > + _tprintf( _T("sendto() failed with WSAEADDRNOTAVAIL\n") ); > + break; > + case WSAEAFNOSUPPORT: > + _tprintf( _T("sendto() failed with WSAEAFNOSUPPORT\n") ); > + break; > + case WSAEDESTADDRREQ: > + _tprintf( _T("sendto() failed with WSAEDESTADDRREQ\n") ); > + break; > + case WSAENETUNREACH: > + _tprintf( _T("sendto() failed with WSAENETUNREACH\n") ); > + break; > + case WSAETIMEDOUT: > + _tprintf( _T("sendto() failed with WSAETIMEDOUT\n") ); > + break; > + default: > + _tprintf( _T("sendto() failed with unknown error\n") ); > + } > + > + return FALSE; > + } > + > + bWait = TRUE; > + > + while( bWait ) > + { > + /* Wait for the DNS reply. */ > + j = recvfrom( s, > + pOutBuffer, > + *pOutBufferLength, > + 0, > + (SOCKADDR*)&SendAddr, > + &SendAddrLen ); > + if( j == SOCKET_ERROR ) > + { > + switch( WSAGetLastError() ) > + { > + case WSANOTINITIALISED: > + _tprintf( _T("recvfrom() failed with WSANOTINITIALIZED\n") ); > + break; > + case WSAENETDOWN: > + _tprintf( _T("recvfrom() failed with WSAENETDOWN\n") ); > + break; > + case WSAEACCES: > + _tprintf( _T("recvfrom() failed with WSAEACCES\n") ); > + break; > + case WSAEINVAL: > + _tprintf( _T("recvfrom() failed with WSAEINVAL\n") ); > + break; > + case WSAEINTR: > + _tprintf( _T("recvfrom() failed with WSAEINTR\n") ); > + break; > + case WSAEINPROGRESS: > + _tprintf( _T("recvfrom() failed with WSAEINPROGRESS\n") ); > + break; > + case WSAEFAULT: > + _tprintf( _T("recvfrom() failed with WSAEFAULT\n") ); > + break; > + case WSAENETRESET: > + _tprintf( _T("recvfrom() failed with WSAENETRESET\n") ); > + break; > + case WSAENOBUFS: > + _tprintf( _T("recvfrom() failed with WSAENOBUFS\n") ); > + break; > + case WSAENOTCONN: > + _tprintf( _T("recvfrom() failed with WSAENOTCONN\n") ); > + break; > + case WSAENOTSOCK: > + _tprintf( _T("recvfrom() failed with WSAENOTSOCK\n") ); > + break; > + case WSAEOPNOTSUPP: > + _tprintf( _T("recvfrom() failed with WSAEOPNOTSUPP\n") ); > + break; > + case WSAESHUTDOWN: > + _tprintf( _T("recvfrom() failed with WSAESHUTDOWN\n") ); > + break; > + case WSAEWOULDBLOCK: > + _tprintf( _T("recvfrom() failed with WSAEWOULDBLOCK\n") ); > + break; > + case WSAEMSGSIZE: > + _tprintf( _T("recvfrom() failed with WSAEMSGSIZE\n") ); > + break; > + case WSAEHOSTUNREACH: > + _tprintf( _T("recvfrom() failed with WSAEHOSTUNREACH\n") ); > + break; > + case WSAECONNABORTED: > + _tprintf( _T("recvfrom() failed with WSAECONNABORTED\n") ); > + break; > + case WSAECONNRESET: > + _tprintf( _T("recvfrom() failed with WSAECONNRESET\n") ); > + break; > + case WSAEADDRNOTAVAIL: > + _tprintf( _T("recvfrom() failed with WSAEADDRNOTAVAIL\n") ); > + break; > + case WSAEAFNOSUPPORT: > + _tprintf( _T("recvfrom() failed with WSAEAFNOSUPPORT\n") ); > + break; > + case WSAEDESTADDRREQ: > + _tprintf( _T("recvfrom() failed with WSAEDESTADDRREQ\n") ); > + break; > + case WSAENETUNREACH: > + _tprintf( _T("recvfrom() failed with WSAENETUNREACH\n") ); > + break; > + case WSAETIMEDOUT: > + _tprintf( _T("recvfrom() failed with WSAETIMEDOUT\n") ); > + break; > + default: > + _tprintf( _T("recvfrom() failed with unknown error\n") ); > + } > + > + return FALSE; > + } > + > + ResponseID = ntohs( ((PSHORT)&pOutBuffer[0])[0] ); > + > + if( ResponseID == RequestID ) bWait = FALSE; > + } > + > + /* We don't need the sockets anymore. */ > + closesocket( s ); > + > + /* If debug information then display debug information. */ > + if( State.debug ) PrintDebug( pOutBuffer, j ); > + > + /* Return the real output buffer length. */ > + *pOutBufferLength = j; > + > + return TRUE; > +} > + > +void ReverseIP( PCHAR pIP, PCHAR pReturn ) > +{ > + int i; > + int j; > + int k = 0; > + > + j = strlen( pIP ) - 1; > + i = j; > + > + /* We have A.B.C.D > + We will turn this into D.C.B.A and stick it in pReturn */ > + > + /* A */ > + for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break; > + > + strncpy( &pReturn[k], &pIP[i + 1], (j - i) ); > + k += (j - i); > + > + pReturn[k] = '.'; > + k += 1; > + > + i -= 1; > + j = i; > + > + /* B */ > + for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break; > + > + strncpy( &pReturn[k], &pIP[i + 1], (j - i) ); > + k += (j - i); > + > + pReturn[k] = '.'; > + k += 1; > + > + i -= 1; > + j = i; > + > + /* C */ > + for( ; i > 0; i -= 1 ) if( '.' == pIP[i] ) break; > + > + strncpy( &pReturn[k], &pIP[i + 1], (j - i) ); > + k += (j - i); > + > + pReturn[k] = '.'; > + k += 1; > + > + i -= 1; > + j = i; > + > + /* D */ > + for( ; i > 0; i -= 1 ); > + > + strncpy( &pReturn[k], &pIP[i], (j - i) + 1 ); > + k += (j - i) + 1; > + > + pReturn[k] = '\0'; > +} > + > +BOOL IsValidIP( PCHAR pInput ) > +{ > + int i = 0, l = 0, b = 0, c = 1; > + > + /* Max length of an IP, e.g. 255.255.255.255, is 15 characters. */ > + l = strlen( pInput ); > + if( l > 15 ) return FALSE; > + > + /* 'b' is the count of the current segment. It gets reset after seeing a > + '.'. */ > + for( ; i < l; i += 1 ) > + { > + if( '.' == pInput[i] ) > + { > + if( !b ) return FALSE; > + if( b > 3 ) return FALSE; > + > + b = 0; > + c += 1; > + } > + else > + { > + b += 1; > + > + if( (pInput[i] < '0') || (pInput[i] > '9') ) return FALSE; > + } > + } > + > + if( b > 3 ) return FALSE; > + > + /* 'c' is the number of segments seen. If it's less than 4, then it's not > + a valid IP. */ > + if( c < 4 ) return FALSE; > + > + return TRUE; > +} > + > +int ExtractName( PCHAR pBuffer, PCHAR pOutput, USHORT Offset, UCHAR Limit ) > +{ > + int c = 0, d = 0, i = 0, j = 0, k = 0, l = 0, m = 0; > + > + i = Offset; > + > + /* If Limit == 0, then we assume "no" limit. */ > + d = Limit; > + if( 0 == Limit ) d = 255; > + > + while( d > 0 ) > + { > + l = pBuffer[i] & 0xFF; > + i += 1; > + if( !m ) c += 1; > + > + if( 0xC0 == l ) > + { > + if( !m ) c += 1; > + m = 1; > + d += (255 - Limit); > + i = pBuffer[i]; > + } > + else > + { > + for( j = 0; j < l; j += 1 ) > + { > + pOutput[k] = pBuffer[i]; > + > + i += 1; > + if( !m ) c += 1; > + k += 1; > + d -= 1; > + } > + > + d -= 1; > + > + if( !pBuffer[i] || (d < 1) ) break; > + > + pOutput[k] = '.'; > + k += 1; > + } > + }; > + > + if( !m ) > + { > + if( !Limit ) c += 1; > + } > + > + pOutput[k] = '\0'; > + > + return c; > +} > + > +int ExtractIP( PCHAR pBuffer, PCHAR pOutput, USHORT Offset ) > +{ > + int c = 0, l = 0, i = 0, v = 0; > + > + i = Offset; > + > + v = (UCHAR)pBuffer[i]; > + l += 1; > + i += 1; > + > + sprintf( &pOutput[c], "%d.", v ); > + c += strlen( &pOutput[c] ); > + > + v = (UCHAR)pBuffer[i]; > + l += 1; > + i += 1; > + > + sprintf( &pOutput[c], "%d.", v ); > + c += strlen( &pOutput[c] ); > + > + v = (UCHAR)pBuffer[i]; > + l += 1; > + i += 1; > + > + sprintf( &pOutput[c], "%d.", v ); > + c += strlen( &pOutput[c] ); > + > + v = (UCHAR)pBuffer[i]; > + l += 1; > + i += 1; > + > + sprintf( &pOutput[c], "%d", v ); > + c += strlen( &pOutput[c] ); > + > + pOutput[c] = '\0'; > + > + return l; > +} > + > +void PrintD2( PCHAR pBuffer, DWORD BufferLength ) > +{ > + USHORT RequestID; > + UCHAR Header1, Header2; > + USHORT NumQuestions, NumAnswers, NumAuthority, NumAdditional; > + USHORT Type, Class; > + CHAR pName[255]; > + int i = 0, k = 0; > + > + RequestID = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Header1 = pBuffer[i]; > + i += 1; > + > + Header2 = pBuffer[i]; > + i += 1; > + > + NumQuestions = ntohs( ((PSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAnswers = ntohs( ((PSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAuthority = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAdditional = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T("------------\n") ); > + _tprintf( _T("SendRequest(), len %d\n"), (int)BufferLength ); > + _tprintf( _T(" HEADER:\n") ); > + _tprintf( _T(" opcode = %s, id = %d, rcode = %s\n"), > + OpcodeIDtoOpcodeName( (Header1 & 0x78) >> 3 ), > + (int)RequestID, > + RCodeIDtoRCodeName( Header2 & 0x0F ) ); > + > + _tprintf( _T(" header flags: query") ); > + if( Header1 & 0x01 ) _tprintf( _T(", want recursion") ); > + _tprintf( _T("\n") ); > + > + _tprintf( _T(" questions = %d, answers = %d," > + " authority records = %d, additional = %d\n\n"), > + (int)NumQuestions, > + (int)NumAnswers, > + (int)NumAuthority, > + (int)NumAdditional ); > + > + if( NumQuestions ) > + { > + _tprintf( _T(" QUESTIONS:\n") ); > + > + for( k = 0; k < NumQuestions; k += 1 ) > + { > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" %s"), pName ); > + > + Type = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Class = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T(", type = %s, class = %s\n"), > + TypeIDtoTypeName( Type ), > + ClassIDtoClassName( Class ) ); > + } > + } > + > + _tprintf( _T("\n------------\n") ); > +} > + > +void PrintDebug( PCHAR pBuffer, DWORD BufferLength ) > +{ > + USHORT ResponseID; > + UCHAR Header1, Header2; > + USHORT NumQuestions, NumAnswers, NumAuthority, NumAdditional; > + USHORT Type, Class; > + ULONG TTL; > + CHAR pName[255]; > + int d = 0, i = 0, k = 0; > + > + ResponseID = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Header1 = pBuffer[i]; > + i += 1; > + > + Header2 = pBuffer[i]; > + i += 1; > + > + NumQuestions = ntohs( ((PSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAnswers = ntohs( ((PSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAuthority = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + NumAdditional = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T("------------\n") ); > + _tprintf( _T("Got answer (%d bytes):\n"), (int)BufferLength ); > + _tprintf( _T(" HEADER:\n") ); > + _tprintf( _T(" opcode = %s, id = %d, rcode = %s\n"), > + OpcodeIDtoOpcodeName( (Header1 & 0x78) >> 3 ), > + (int)ResponseID, > + RCodeIDtoRCodeName( Header2 & 0x0F ) ); > + > + _tprintf( _T(" header flags: response") ); > + if( Header1 & 0x01 ) _tprintf( _T(", want recursion") ); > + if( Header2 & 0x80 ) _tprintf( _T(", recursion avail.") ); > + _tprintf( _T("\n") ); > + > + _tprintf( _T(" questions = %d, answers = %d, " > + "authority records = %d, additional = %d\n\n"), > + (int)NumQuestions, > + (int)NumAnswers, > + (int)NumAuthority, > + (int)NumAdditional ); > + > + if( NumQuestions ) > + { > + _tprintf( _T(" QUESTIONS:\n") ); > + > + for( k = 0; k < NumQuestions; k += 1 ) > + { > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" %s"), pName ); > + > + Type = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Class = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T(", type = %s, class = %s\n"), > + TypeIDtoTypeName( Type ), > + ClassIDtoClassName( Class ) ); > + } > + } > + > + if( NumAnswers ) > + { > + _tprintf( _T(" ANSWERS:\n") ); > + > + for( k = 0; k < NumAnswers; k += 1 ) > + { > + _tprintf( _T(" -> ") ); > + > + /* Print out the name. */ > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T("%s\n"), pName ); > + > + /* Print out the type, class and data length. */ > + Type = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Class = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + TTL = ntohl( ((PULONG)&pBuffer[i])[0] ); > + i += 4; > + > + d = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T(" type = %s, class = %s, dlen = %d\n"), > + TypeIDtoTypeName( Type ), > + ClassIDtoClassName( Class ), > + d ); > + > + /* Print out the answer. */ > + if( TYPE_A == Type ) > + { > + i += ExtractIP( pBuffer, pName, i ); > + > + _tprintf( _T(" internet address = %s\n"), pName ); > + } > + else > + { > + i += ExtractName( pBuffer, pName, i, d ); > + > + _tprintf( _T(" name = %s\n"), pName ); > + } > + > + _tprintf( _T(" ttl = %d ()\n"), (int)TTL ); > + } > + } > + > + if( NumAuthority ) > + { > + _tprintf( _T(" AUTHORITY RECORDS:\n") ); > + > + for( k = 0; k < NumAuthority; k += 1 ) > + { > + /* Print out the zone name. */ > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" -> %s\n"), pName ); > + > + /* Print out the type, class, data length and TTL. */ > + Type = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Class = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + TTL = ntohl( ((PULONG)&pBuffer[i])[0] ); > + i += 4; > + > + d = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T(" type = %s, class = %s, dlen = %d\n"), > + TypeIDtoTypeName( Type ), > + ClassIDtoClassName( Class ), > + d ); > + > + /* TODO: There might be more types? */ > + if( TYPE_NS == Type ) > + { > + /* Print out the NS. */ > + i += ExtractName( pBuffer, pName, i, d ); > + > + _tprintf( _T(" nameserver = %s\n"), pName ); > + > + _tprintf( _T(" ttl = %d ()\n"), (int)TTL ); > + } > + else if( TYPE_SOA == Type ) > + { > + _tprintf( _T(" ttl = %d ()\n"), (int)TTL ); > + > + /* Print out the primary NS. */ > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" primary name server = %s\n"), pName ); > + > + /* Print out the responsible mailbox. */ > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" responsible mail addr = %s\n"), pName ); > + > + /* Print out the serial, refresh, retry, expire and default TTL. */ > + _tprintf( _T(" serial = ()\n") ); > + _tprintf( _T(" refresh = ()\n") ); > + _tprintf( _T(" retry = ()\n") ); > + _tprintf( _T(" expire = ()\n") ); > + _tprintf( _T(" default TTL = ()\n") ); > + i += 20; > + } > + } > + } > + > + if( NumAdditional ) > + { > + _tprintf( _T(" ADDITIONAL:\n") ); > + > + for( k = 0; k < NumAdditional; k += 1 ) > + { > + /* Print the name. */ > + i += ExtractName( pBuffer, pName, i, 0 ); > + > + _tprintf( _T(" -> %s\n"), pName ); > + > + /* Print out the type, class, data length and TTL. */ > + Type = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + Class = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + TTL = ntohl( ((PULONG)&pBuffer[i])[0] ); > + i += 4; > + > + d = ntohs( ((PUSHORT)&pBuffer[i])[0] ); > + i += 2; > + > + _tprintf( _T(" type = %s, class = %s, dlen = %d\n"), > + TypeIDtoTypeName( Type ), > + ClassIDtoClassName( Class ), > + d ); > + > + /* TODO: There might be more types? */ > + if( TYPE_A == Type ) > + { > + /* Print out the NS. */ > + i += ExtractIP( pBuffer, pName, i ); > + > + _tprintf( _T(" internet address = %s\n"), pName ); > + > + _tprintf( _T(" ttl = %d ()\n"), (int)TTL ); > + } > + } > + } > + > + _tprintf( _T("\n------------\n") ); > +} > + > +PCHAR OpcodeIDtoOpcodeName( UCHAR Opcode ) > +{ > + switch( Opcode & 0x0F ) > + { > + case OPCODE_QUERY: > + return OpcodeQuery; > + > + case OPCODE_IQUERY: > + return OpcodeIQuery; > + > + case OPCODE_STATUS: > + return OpcodeStatus; > + > + default: > + return OpcodeReserved; > + } > +} > + > +PCHAR RCodeIDtoRCodeName( UCHAR RCode ) > +{ > + switch( RCode & 0x0F ) > + { > + case RCODE_NOERROR: > + return RCodeNOERROR; > + > + case RCODE_FORMERR: > + return RCodeFORMERR; > + > + case RCODE_FAILURE: > + return RCodeFAILURE; > + > + case RCODE_NXDOMAIN: > + return RCodeNXDOMAIN; > + > + case RCODE_NOTIMP: > + return RCodeNOTIMP; > + > + case RCODE_REFUSED: > + return RCodeREFUSED; > + > + default: > + return RCodeReserved; > + } > +} > + > +PCHAR TypeIDtoTypeName( USHORT TypeID ) > +{ > + switch( TypeID ) > + { > + case TYPE_A: > + return TypeA; > + > + case TYPE_NS: > + return TypeNS; > + > + case TYPE_CNAME: > + return TypeCNAME; > + > + case TYPE_SOA: > + return TypeSOA; > + > + case TYPE_WKS: > + return TypeSRV; > + > + case TYPE_PTR: > + return TypePTR; > + > + case TYPE_MX: > + return TypeMX; > + > + case TYPE_ANY: > + return TypeAny; > + > + default: > + return "Unknown"; > + } > +} > + > +USHORT TypeNametoTypeID( PCHAR TypeName ) > +{ > + if( !strncmp( TypeName, TypeA, strlen( TypeA ) ) ) return TYPE_A; > + if( !strncmp( TypeName, TypeNS, strlen( TypeNS ) ) ) return TYPE_NS; > + if( !strncmp( TypeName, TypeCNAME, strlen( TypeCNAME ) ) ) return TYPE_CNAME; > + if( !strncmp( TypeName, TypeSOA, strlen( TypeSOA ) ) ) return TYPE_SOA; > + if( !strncmp( TypeName, TypeSRV, strlen( TypeSRV ) ) ) return TYPE_WKS; > + if( !strncmp( TypeName, TypePTR, strlen( TypePTR ) ) ) return TYPE_PTR; > + if( !strncmp( TypeName, TypeMX, strlen( TypeMX ) ) ) return TYPE_MX; > + if( !strncmp( TypeName, TypeAny, strlen( TypeAny ) ) ) return TYPE_ANY; > + > + return 0; > +} > + > +PCHAR ClassIDtoClassName( USHORT ClassID ) > +{ > + switch( ClassID ) > + { > + case CLASS_IN: > + return ClassIN; > + > + case CLASS_ANY: > + return ClassAny; > + > + default: > + return "Unknown"; > + } > +} > + > +USHORT ClassNametoClassID( PCHAR ClassName ) > +{ > + if( !strncmp( ClassName, ClassIN, strlen( ClassIN ) ) ) return CLASS_IN; > + if( !strncmp( ClassName, ClassAny, strlen( ClassAny ) ) ) return CLASS_ANY; > + > + return 0; > +} > > Propchange: trunk/reactos/base/applications/network/nslookup/utility.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > 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] Fri Oct 23 19:25:05 2009 > @@ -64,6 +64,7 @@ > base\applications\network\ftp\ftp.exe 1 > base\applications\network\ipconfig\ipconfig.exe 1 > base\applications\network\netstat\netstat.exe 1 > +base\applications\network\nslookup\nslookup.exe 1 > base\applications\network\ping\ping.exe 1 > base\applications\network\telnet\telnet.exe 1 > base\applications\network\tracert\tracert.exe 1 > > >

2 3

Debug Registers, QEMU and 43705
by Stefan Ginsberg 23 Oct '09

23 Oct '09

Ammendment to 43705 -- the KVM/QEMUversions we use on the build server today does, in fact, implement debug registers, and all the ntdll exception tests now pass. _________________________________________________________________ Windows Live: Friends get your Flickr, Yelp, and Digg updates when they e-mail you. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 43693: - Limit the number of interrupts that are handled per call to MiniportHandleInterrupt to prevent us from staying at DISPATCH_LEVEL for too long
by Alex Ionescu 23 Oct '09

23 Oct '09

Do the cards not support interrupt coalescing? Best regards, Alex Ionescu On Fri, Oct 23, 2009 at 1:27 AM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Fri Oct 23 02:27:00 2009 > New Revision: 43693 > > URL: http://svn.reactos.org/svn/reactos?rev=43693&view=rev > Log: > - Limit the number of interrupts that are handled per call to MiniportHandleInterrupt to prevent us from staying at DISPATCH_LEVEL for too long > > Modified: > trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h > trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c > trunk/reactos/drivers/network/dd/pcnet/pcnet.c > trunk/reactos/drivers/network/dd/pcnet/pcnet.h > > Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… > ============================================================================== > --- trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Fri Oct 23 02:27:00 2009 > @@ -55,7 +55,8 @@ > /* Interrupt Mask Register value */ > #define DRIVER_INTERRUPT_MASK IMR_ALLE - IMR_RDCE > > - > +/* Maximum number of interrupts handled per call to MiniportHandleInterrupt */ > +#define INTERRUPT_LIMIT 10 > > /* Global structures */ > > > Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… > ============================================================================== > --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Fri Oct 23 02:27:00 2009 > @@ -1315,6 +1315,7 @@ > UCHAR ISRMask; > UCHAR Mask; > PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; > + UINT i = 0; > > ISRMask = Adapter->InterruptMask; > NdisRawReadPortUchar(Adapter->IOBase + PG0_ISR, &ISRValue); > @@ -1323,12 +1324,14 @@ > > Adapter->InterruptStatus |= (ISRValue & ISRMask); > > - if (ISRValue != 0x00) > - /* Acknowledge interrupts */ > - NdisRawWritePortUchar(Adapter->IOBase + PG0_ISR, ISRValue); > - > Mask = 0x01; > - while (Adapter->InterruptStatus != 0x00) { > + while (Adapter->InterruptStatus != 0x00 && i++ < INTERRUPT_LIMIT) { > + > + if (ISRValue != 0x00) { > + /* Acknowledge interrupts */ > + NdisRawWritePortUchar(Adapter->IOBase + PG0_ISR, ISRValue); > + Mask = 0x01; > + } > > NDIS_DbgPrint(MID_TRACE, ("Adapter->InterruptStatus (0x%X) Mask (0x%X).\n", > Adapter->InterruptStatus, Mask)); > @@ -1409,12 +1412,6 @@ > NDIS_DbgPrint(MID_TRACE, ("ISRValue (0x%X).\n", ISRValue)); > > Adapter->InterruptStatus |= (ISRValue & ISRMask); > - > - if (ISRValue != 0x00) { > - /* Acknowledge interrupts */ > - NdisRawWritePortUchar(Adapter->IOBase + PG0_ISR, ISRValue); > - Mask = 0x01; > - } > } > > NICEnableInterrupts((PNIC_ADAPTER)MiniportAdapterContext); > > Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… > ============================================================================== > --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Oct 23 02:27:00 2009 > @@ -66,6 +66,7 @@ > { > PADAPTER Adapter = (PADAPTER)MiniportAdapterContext; > USHORT Data; > + UINT i = 0; > > DPRINT("Called\n"); > > @@ -78,7 +79,7 @@ > > DPRINT("CSR0 is 0x%x\n", Data); > > - while(Data & CSR0_INTR) > + while((Data & CSR0_INTR) && i++ < INTERRUPT_LIMIT) > { > /* Clear interrupt flags early to avoid race conditions. */ > NdisRawWritePortUshort(Adapter->PortOffset + RDP, Data); > > Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… > ============================================================================== > --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Fri Oct 23 02:27:00 2009 > @@ -149,6 +149,9 @@ > /* flags */ > #define RESET_IN_PROGRESS 0x1 > > +/* Maximum number of interrupts handled per call to MiniportHandleInterrupt */ > +#define INTERRUPT_LIMIT 10 > + > #if DBG > #define BREAKPOINT DbgBreakPoint(); > #else > > >

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev