- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [tkreuzer] 52496: [FAT32] Add some code that does ... nothing, but fixes 2nd stage boot with msvc. To figure out why this is needed, is left as an excercise to the reader :)
by Alex Ionescu 01 Jul '11

01 Jul '11

I know why this is "needed", but this is a temporary hack, right? Best regards, Alex Ionescu On Thu, Jun 30, 2011 at 9:06 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Fri Jul 1 01:06:19 2011 > New Revision: 52496 > > URL: http://svn.reactos.org/svn/reactos?rev=52496&view=rev > Log: > [FAT32] > Add some code that does ... nothing, but fixes 2nd stage boot with msvc. To figure out why this is needed, is left as an excercise to the reader :) > > Modified: > trunk/reactos/boot/freeldr/bootsect/fat32.S > > Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… > ============================================================================== > --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Fri Jul 1 01:06:19 2011 > @@ -194,6 +194,13 @@ > mov dl, byte ptr BP_REL(BootDrive) // Drive number > mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read > int HEX(13) // Call BIOS > + > + /* This code "fixes" loading the MSVC built kernel */ > + pushad > + mov si, offset msgNull > + call PutChars > + popad > + > jc PrintDiskError // If the read failed then abort > > add sp, 16 // Remove disk address packet from stack > @@ -302,6 +309,8 @@ > .ascii "File system error", CR, LF, NUL > msgAnyKey: > .ascii "Press any key to restart", CR, LF, NUL > +msgNull: > + .ascii NUL > > .org 509 // Pad to 509 bytes > > @@ -527,7 +536,7 @@ > filename: > .ascii "FREELDR SYS" > msgLoading: > - .ascii "Loading FreeLoader...\r\n", CR, LF, NUL > + .ascii "Loading FreeLoader...", CR, LF, NUL > > .org 1022 // Pad to 1022 bytes > > > >

2 1

Monthly meeting reminder
by Aleksey Bragin 30 Jun '11

30 Jun '11

Hello, Last thursday of this month is quite close, 30th of June, 20:00 UTC I'm awaiting you all for the monthly status meeting. Colin said that our private irc server is going to be ready by that date, so if that's still true, Colin - could you please provide details for those who don't remember where to connect? Proposed agenda is: 1. New release of ReactOS 2. Website work status 3. GSoC status 4. Developers status. With the best regards, Aleksey Bragin.

11 23

Re: [ros-dev] [ros-diffs] [osiejka] 52486: [TRANSLATION] - CACLS, CALC and CHARMAP UTF8 co
by Pierre Schweitzer 29 Jun '11

29 Jun '11

I'm definitely not sure that the header[1] added to all converted files was absolute necessity. AFAIK, that's SVN logs purpose... Unless someone has a real justification to such line? Many files even don't have a translator copyright but this line... Weird! [1]: /* UTF-8 Conversion: Elton Chung aka MfldElton <elton328(a)gmail.com> (June, 2011) */

5 5

Re: [ros-dev] [ros-diffs] [ekohl] 52470: [NDK] Add missing interrupt resource descriptor flags.
by Alex Ionescu 27 Jun '11

27 Jun '11

Hi Erik, The NDK is for *undocumented* types. These flags are documented. -- Best regards, Alex Ionescu On 2011-06-26, at 7:29 AM, ekohl(a)svn.reactos.org wrote: > CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE

3 2

LDR rewrite
by Aleksey Bragin 26 Jun '11

26 Jun '11

Hello, as all of you could notice, I committed the LDR rewrite recently. I tried to get rid of as much regressions as possible (any rewrite should introduce improvements of course, rewrites are not done to introduce regressions, however there is no rewrite without some particulars problems). So, dear developers, I need your help. Gabriel did a very nice work and bugzilled all kinds of problems which new LDR introduced. Here is the meta-bug: http://www.reactos.org/bugzilla/show_bug.cgi?id=6346 Please look into the bugs, check something and add your findings to bugzilla. The new LDR code is perfectly organized, very well documented, so most of those bugs should be quite simple to fix, but my time is not infinite, so I'm asking for collaboration. I'm always available via IRC for any questions about the new code, so feel free to ask. Put away your usual stuff for an hour or for a day and look into those. It would help greatly and motivate me to finish other parts of the rewrite quicker. Thanks, Aleksey Bragin.

1 0

dmesg of #6018 Re: [ros-diffs] [rharabien] 52409: [BOOTVID] - Revert part of r52239: Fix support for \r and do not handle backspace - Simplify it a bit [NTOSKRNL] - Add backspace support to KdpScreenPrint - Do not draw boot text...
by Minas Abrahamyan 21 Jun '11

21 Jun '11

Dear Rafal, Since you are touching the code of /ntoskrnl/kd/kdio.c, wouldn't you be kind enough to review and possibly apply my "dmesg command patch"? Issue in bugzilla: http://www.reactos.org/bugzilla/show_bug.cgi?id=6018 patch itself: http://www.reactos.org/bugzilla/attachment.cgi?id=6055 It contains much of code of KdbpPrint() function, in function KdbpPager(), etc. The is explanations about it in issue description. *** To all: This patch is suspended in bugzilla from March, although I noticed some weak attempts to do something with it, say reassign to somebody, but yet without any advance. Hope something will be changed with this. Thanks for attention -Minas Abrahamyan On Wed, Jun 22, 2011 at 12:47 AM, <rharabien(a)svn.reactos.org> wrote: > Author: rharabien > Date: Tue Jun 21 19:47:13 2011 > New Revision: 52409 > > URL: http://svn.reactos.org/svn/reactos?rev=52409&view=rev > Log: > [BOOTVID] > - Revert part of r52239: Fix support for \r and do not handle backspace > - Simplify it a bit > > [NTOSKRNL] > - Add backspace support to KdpScreenPrint > - Do not draw boot text bitmap if InbvDisplayString is called with "" or "." (matches NT behavior) > > Modified: > trunk/reactos/drivers/base/bootvid/i386/vga.c > trunk/reactos/ntoskrnl/inbv/inbv.c > trunk/reactos/ntoskrnl/kd/kdio.c > > Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… > ============================================================================== > --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Tue Jun 21 19:47:13 2011 > @@ -66,6 +66,7 @@ > ULONG TextColor = 0xF; > ULONG curr_x = 0; > ULONG curr_y = 0; > +BOOLEAN CarriageReturn = FALSE; > ULONG_PTR VgaRegisterBase = 0; > ULONG_PTR VgaBase = 0; > > @@ -279,14 +280,8 @@ > NTAPI > VgaScroll(ULONG Scroll) > { > - ULONG Top; > - ULONG SourceOffset, DestOffset; > - ULONG Offset; > - ULONG i, j; > - > - /* Set memory positions of the scroll */ > - SourceOffset = VgaBase + (ScrollRegion[1] * 80) + (ScrollRegion[0] >> 3); > - DestOffset = SourceOffset + (Scroll * 80); > + ULONG Top, RowSize, i; > + PUCHAR OldPosition, NewPosition; > > /* Clear the 4 planes */ > __outpw(0x3C4, 0xF02); > @@ -296,56 +291,27 @@ > > /* Set Mode 1 */ > ReadWriteMode(1); > - > - /* Save top and check if it's above the bottom */ > - Top = ScrollRegion[1]; > - if (Top > ScrollRegion[3]) return; > + > + RowSize = (ScrollRegion[2] - ScrollRegion[0] + 1) / 8; > > /* Start loop */ > - do > - { > - /* Set number of bytes to loop and start offset */ > - Offset = ScrollRegion[0] >> 3; > - j = SourceOffset; > - > - /* Check if this is part of the scroll region */ > - if (Offset <= (ScrollRegion[2] >> 3)) > - { > - /* Update position */ > - i = DestOffset - SourceOffset; > - > - /* Loop the X axis */ > - do > - { > - /* Write value in the new position so that we can do the scroll */ > - WRITE_REGISTER_UCHAR(UlongToPtr(j), > - READ_REGISTER_UCHAR(UlongToPtr(j + i))); > - > - /* Move to the next memory location to write to */ > - j++; > - > - /* Move to the next byte in the region */ > - Offset++; > - > - /* Make sure we don't go past the scroll region */ > - } while (Offset <= (ScrollRegion[2] >> 3)); > - } > - > - /* Move to the next line */ > - SourceOffset += 80; > - DestOffset += 80; > - > - /* Increase top */ > - Top++; > - > - /* Make sure we don't go past the scroll region */ > - } while (Top <= ScrollRegion[3]); > + for(Top = ScrollRegion[1]; Top <= ScrollRegion[3]; ++Top) > + { > + /* Calculate the position in memory for the row */ > + OldPosition = (PUCHAR)VgaBase + (Top + Scroll) * 80 + ScrollRegion[0] / 8; > + NewPosition = (PUCHAR)VgaBase + Top * 80 + ScrollRegion[0] / 8; > + > + /* Scroll the row */ > + for(i = 0; i < RowSize; ++i) > + WRITE_REGISTER_UCHAR(NewPosition + i, READ_REGISTER_UCHAR(OldPosition + i)); > + } > } > > VOID > NTAPI > PreserveRow(IN ULONG CurrentTop, > - IN ULONG TopDelta) > + IN ULONG TopDelta, > + IN BOOLEAN Direction) > { > PUCHAR Position1, Position2; > ULONG Count; > @@ -359,9 +325,19 @@ > /* Set Mode 1 */ > ReadWriteMode(1); > > - /* Calculate the position in memory for the row */ > - Position1 = (PUCHAR)VgaBase + 0x9600; > - Position2 = (PUCHAR)VgaBase + CurrentTop * 80; > + /* Check which way we're preserving */ > + if (Direction) > + { > + /* Calculate the position in memory for the row */ > + Position1 = (PUCHAR)VgaBase + CurrentTop * 80; > + Position2 = (PUCHAR)VgaBase + 0x9600; > + } > + else > + { > + /* Calculate the position in memory for the row */ > + Position1 = (PUCHAR)VgaBase + 0x9600; > + Position2 = (PUCHAR)VgaBase + CurrentTop * 80; > + } > > /* Set the count and make sure it's above 0 */ > Count = TopDelta * 80; > @@ -378,33 +354,6 @@ > Position1++; > } while (--Count); > } > -} > - > -VOID > -NTAPI > -CleanCharacter(IN ULONG Left, > - IN ULONG Top, > - IN ULONG TopDelta) > -{ > - PUCHAR Position1, Position2; > - ULONG i; > - > - /* Clear the 4 planes */ > - __outpw(0x3C4, 0xF02); > - > - /* Set the bitmask to 0xFF for all 4 planes */ > - __outpw(0x3CE, 0xFF08); > - > - /* Set Mode 1 */ > - ReadWriteMode(1); > - > - /* Calculate the position in memory for the character */ > - Position1 = (PUCHAR)VgaBase + 0x9600 + Left / 8; > - Position2 = (PUCHAR)VgaBase + Top * 80 + Left / 8; > - > - /* Copy data from preserved row */ > - for(i = 0; i < TopDelta; ++i) > - WRITE_REGISTER_UCHAR(Position2 + i * 80, READ_REGISTER_UCHAR(Position1)); > } > > VOID > @@ -772,35 +721,34 @@ > } > else > { > - /* Preserve the current row */ > - PreserveRow(curr_y, TopDelta); > + /* Preserve row */ > + PreserveRow(curr_y, TopDelta, FALSE); > } > > /* Update current X */ > curr_x = ScrollRegion[0]; > + > + /* Do not clear line if "\r\n" is given */ > + CarriageReturn = FALSE; > } > else if (*String == '\r') > { > /* Update current X */ > curr_x = ScrollRegion[0]; > - } > - else if (*String == '\b') > - { > - /* Update current X */ > - if (curr_x > ScrollRegion[0]) > - curr_x -= 8; > - else > - { > - /* We are at line begin - move to previous row */ > - curr_x = ScrollRegion[0]; > - curr_y -= TopDelta; > + > + /* Check if we're being followed by a new line */ > + CarriageReturn = TRUE; > + } > + else > + { > + /* check if we had a '\r' last time */ > + if (CarriageReturn) > + { > + /* We did, clear the current row */ > + PreserveRow(curr_y, TopDelta, TRUE); > + CarriageReturn = FALSE; > } > - > - /* Clean current character */ > - CleanCharacter(curr_x, curr_y, TopDelta); > - } > - else > - { > + > /* Display this character */ > DisplayCharacter(*String, curr_x, curr_y, TextColor, 16); > curr_x += 8; > @@ -819,7 +767,7 @@ > else > { > /* Preserve the current row */ > - PreserveRow(curr_y, TopDelta); > + PreserveRow(curr_y, TopDelta, FALSE); > } > > /* Update X */ > > Modified: trunk/reactos/ntoskrnl/inbv/inbv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… > ============================================================================== > --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jun 21 19:47:13 2011 > @@ -717,11 +717,15 @@ > INIT_FUNCTION > DisplayFilter(PCHAR *String) > { > - /* Remove the filter */ > - InbvInstallDisplayStringFilter(NULL); > - > - /* Draw text screen */ > - DisplayBootBitmap(TRUE); > + /* Ignore empty and "." strings */ > + if(*String && strcmp(String, ".") != 0) > + { > + /* Remove the filter */ > + InbvInstallDisplayStringFilter(NULL); > + > + /* Draw text screen */ > + DisplayBootBitmap(TRUE); > + } > } > > VOID > > Modified: trunk/reactos/ntoskrnl/kd/kdio.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=524… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Tue Jun 21 19:47:13 2011 > @@ -28,6 +28,10 @@ > > /* Current Port in use. FIXME: Do we support more then one? */ > ULONG KdpPort; > + > +#define KdpScreenLineLenght 80 > +CHAR KdpScreenLineBuffer[KdpScreenLineLenght + 1] = ""; > +ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; > > /* DEBUG LOG FUNCTIONS *******************************************************/ > > @@ -316,8 +320,50 @@ > KdpScreenPrint(LPSTR Message, > ULONG Length) > { > - /* Call HAL */ > - HalDisplayString(Message); > + PCHAR pch = (PCHAR) Message; > + > + while (*pch) > + { > + if(*pch == '\b') > + { > + /* HalDisplayString does not support '\b'. Workaround it and use '\r' */ > + if(KdpScreenLineLength > 0) > + { > + /* Remove last character from buffer */ > + KdpScreenLineBuffer[--KdpScreenLineLength] = '\0'; > + KdpScreenLineBufferPos = KdpScreenLineLength; > + > + /* Clear row and print line again */ > + HalDisplayString("\r"); > + HalDisplayString(KdpScreenLineBuffer); > + } > + } > + else > + { > + KdpScreenLineBuffer[KdpScreenLineLength++] = *pch; > + KdpScreenLineBuffer[KdpScreenLineLength] = '\0'; > + } > + > + if(*pch == '\n' || KdpScreenLineLength == KdpScreenLineLenght) > + { > + /* Print buffered characters */ > + if(KdpScreenLineBufferPos != KdpScreenLineLength) > + HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); > + > + /* Clear line buffer */ > + KdpScreenLineBuffer[0] = '\0'; > + KdpScreenLineLength = KdpScreenLineBufferPos = 0; > + } > + > + ++pch; > + } > + > + /* Print buffered characters */ > + if(KdpScreenLineBufferPos != KdpScreenLineLength) > + { > + HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); > + KdpScreenLineBufferPos = KdpScreenLineLength; > + } > } > > VOID > > >

1 0

Re: [ros-dev] [ros-diffs] [sir_richard] 52098: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms wou...
by Gabriel ilardi 21 Jun '11

21 Jun '11

Hi sir_richard and welcome back! Just to make sure you know, it seems this commit introduces a regression, ros hangs while loading ndis.sys, see testbot logs: http://build.reactos.org/builders/Windows_AMD64_1%20VBox-Test/builds/1342/s… I've filed http://www.reactos.org/bugzilla/show_bug.cgi?id=6292 Could you please take a look? Thanks. > Date: Sun, 5 Jun 2011 20:48:34 +0000 > To: ros-diffs(a)reactos.org > From: sir_richard(a)svn.reactos.org > Subject: [ros-diffs] [sir_richard] 52098: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms wou... > > Author: sir_richard > Date: Sun Jun 5 20:48:34 2011 > New Revision: 52098 > > URL: http://svn.reactos.org/svn/reactos?rev=52098&view=rev > Log: > [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms would build FreeLDR "page entries" for every page from 0 to 0x7FFF0000 and mark it as unusable, then build the actual valid entries from 0x80000000 -> end of RAM, thus resulting in large memory consumption (and in the bloat of the PFN database later once NTOS loads) and boot time. Therefore, the algorithm is changed to start the PFN database at the lowest valid RAM page described by the Firemware descriptors, and entries therefore will be offset. This means a 128MB embedded system no longer appears to have 2048+128MB of RAM worth of PFN entries. > NOTE: Windows does not do this, opting instead to force manufacturers/use pull-up resistors/reconfigure the ARM Bus to map RAM at 0x00000000. For wider portability, I believe it makes more sense to simply do this "trick" in the boot loader. > > Modified: > trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c > trunk/reactos/boot/freeldr/freeldr/mm/meminit.c >

1 1

freeldr
by Timo Kreuzer 20 Jun '11

20 Jun '11

Hi, I'd like to change the Vtbl based architecture of freeldr into a normal function call system. Currently we have stuff like #define MachHwDetect() MachVtbl.HwDetect() MachVtbl.HwDetect = PcHwDetect; This is IHO simply useless, since these functions don't change. I suggest simply renaming PcHwDetect to MachHwDetect and do that will all of those and get rid of the MachVtbl. Any objections? Regards, Timo

5 10

Re: [ros-dev] [ros-diffs] [gedmurphy] 52364: [BROWSEUI] - Set the prototypes to be long instead of LONG. This only worked in rbuild previously because WIDL incorrectly generates a LONG for long types. - define SHANDLE_PTR a...
by Colin Finck 19 Jun '11

19 Jun '11

gedmurphy(a)svn.reactos.org wrote: > +// WIDL temp hack : [...] Even though we all like to see a full MSVC build in the future, does this really justify such an even bigger hack on top of the existing ones? Would a proper fix really require that much more time? If we don't want to end up in a new mess, this pretty much forces someone to fix it in the coming days or the hack/commit will be forgotten again. I'm certain about this, because nobody on #reactos-dev really knew the reason behind the older __ROS_LONG64__ hack either. Alternatively, you could open a detailed bug report about this issue and assign some CMake people to it. But in any case, such hacks should be tracked in our Bugzilla, in particular when more information about a solution is known already. - Colin

3 4

Re: [ros-dev] [ros-diffs] [jgardou] 52365: [GDI32] - remove useless check.
by Timo Kreuzer 19 Jun '11

19 Jun '11

Am 19.06.2011 15:11, schrieb jgardou(a)svn.reactos.org: > Author: jgardou > Date: Sun Jun 19 13:11:39 2011 > New Revision: 52365 > > URL: http://svn.reactos.org/svn/reactos?rev=52365&view=rev > Log: > [GDI32] > - remove useless check. > > > + _SEH2_TRY > + { > + RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); > + } > + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > + { > + Hit = TRUE; > + } > + _SEH2_END > + > + if (Hit) > + { > + // We don't die, we continue on with a allocated safe pointer to kernel > + // space..... > + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x& Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); > + } > + DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); > + } > > if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) > { This code looks retarded as well. Especially the comment about the "safe" pointer...

1 0

Re: [ros-dev] [ros-diffs] [jgardou] 52339: [NTOSKRNL] - don't rely on a boolean being 1 or 0, it's a bad idea (tm)
by Alex Ionescu 19 Jun '11

19 Jun '11

??? This is retarded. You're doing 0 ? 0 : 1 Best regards, Alex Ionescu On Sat, Jun 18, 2011 at 3:45 PM, <jgardou(a)svn.reactos.org> wrote: > Author: jgardou > Date: Sat Jun 18 14:45:08 2011 > New Revision: 52339 > > URL: http://svn.reactos.org/svn/reactos?rev=52339&view=rev > Log: > [NTOSKRNL] > - don't rely on a boolean being 1 or 0, it's a bad idea (tm) > > Modified: > trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > > Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Jun 18 14:45:08 2011 > @@ -1510,7 +1510,7 @@ > > /* Set thread fields */ > Thread->TrapFrame = TrapFrame; > - Thread->PreviousMode = KiUserTrap(TrapFrame); > + Thread->PreviousMode = KiUserTrap(TrapFrame) ? UserMode : KernelMode; > > /* Enable interrupts */ > _enable(); > > >

2 4

Suggestion for signed driver
by Javier Agustìn Fernàndez Arroyo 17 Jun '11

17 Jun '11

Hi folks, have you taken a look into this driver? what about signing it? http://code.google.com/p/cmediadrivers/

4 3

Re: [ros-dev] [ros-diffs] [cgutman] 52288: [FILESYSTEMS] - Handle IRP_MN_KERNEL_CALL for k
by Pierre Schweitzer 17 Jun '11

17 Jun '11

FAT & CDFS FSDs are not supposed to handle IRP_MN_KERNEL_CALL.

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 52277: [NTOSKRNL] - Use the IopParseDevice hack for floppies too (needed for format and chkdsk to work)
by Alex Ionescu 16 Jun '11

16 Jun '11

You think they might try requesting valid attributes instead? :) Best regards, Alex Ionescu On Thu, Jun 16, 2011 at 9:31 AM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Thu Jun 16 13:31:12 2011 > New Revision: 52277 > > URL: http://svn.reactos.org/svn/reactos?rev=52277&view=rev > Log: > [NTOSKRNL] > - Use the IopParseDevice hack for floppies too (needed for format and chkdsk to work) > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/file.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Thu Jun 16 13:31:12 2011 > @@ -408,7 +408,8 @@ > if (!(DirectOpen) && > !(RemainingName->Length) && > !(OpenPacket->RelatedFileObject) && > - ((wcsstr(CompleteName->Buffer, L"Harddisk"))) && > + ((wcsstr(CompleteName->Buffer, L"Harddisk")) || > + (wcsstr(CompleteName->Buffer, L"Floppy"))) && > !(UseDummyFile)) > { > DPRINT1("Using IopParseDevice() hack. Requested invalid attributes: %lx\n", > > >

1 0

Removing usbdriver.sys from build
by Colin Finck 15 Jun '11

15 Jun '11

Hello all, Edijus from #reactos has just tried ReactOS on his system, but the boot process got stuck at "usbdriver.sys". When reading his notice, I was wondering why we still include this ancient driver in every ReactOS build. As far as I know ... * it has never worked for us * it is incomplete and not well-tested * it has obvious code bugs (e.g. just look in ehci.c:3465 how it enumerates more PCI devices and functions than possible, consequently enumerating the first function twice due to bitshifts) * better USB work by Johannes and Michael is progressing well Although it might be useful as a testcase for the legacy HAL functions (like HalAssignSlotResources), it should still be removed from the build process for now. If there are no objections, I'll do this change on the weekend. - Colin

2 3

freeldr
by Timo Kreuzer 15 Jun '11

15 Jun '11

Hi, While taking a short break from my GSOC work, I like to do some work on freeldr. Final goal is to make it work with MSVC, but first I'd like to do a little cleanup, since its a bit messy. First I'd like to know how the state of the old bootcode is and if we still need it and whats left to do to get rid of it. Then I'd suggest to remove the code that draws purple unicorns like it was done for ARM (afaik, we don't use it anyway) I'd also like to fix formatting (tabs -> spaces) Any remarks, objections, wishes, doubts? Regards, Timo

5 10

Re: [ros-dev] [ros-diffs] [tkreuzer] 52237: [DDK] according to WDK FsRtlRemoveBaseMcbEntry
by Pierre Schweitzer 15 Jun '11

15 Jun '11

Thanks for being that efficient for reverting. Less than two days after message on ML. Congratz. Next time I take days off, I won't take four days any longer, in case you would question some other of my patches. I'll also send you my next patches, that way you'll be able to commit them, or just to skip them to prevent any revert.

1 0

Re: [ros-dev] [ros-diffs] [rharabien] 52244: [NTOSKRNL] - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen d...
by Alex Ionescu 15 Jun '11

15 Jun '11

Or another way of putting this... ""Fix" 100% correct reverse engineered NT code and break it so that it matches ReactOS's broken Video Driver Framework behaviour, instead of fixing the latter". Never gets old~ -- Best regards, Alex Ionescu On 2011-06-15, at 8:53 AM, rharabien(a)svn.reactos.org wrote: > Author: rharabien > Date: Wed Jun 15 12:53:32 2011 > New Revision: 52244 > > URL: http://svn.reactos.org/svn/reactos?rev=52244&view=rev > Log: > [NTOSKRNL] > - Disable displaying string by bootvid after successful kernel phase 1 initialization, so there won't be graphical glitches at the top of screen if system has screen debugging enabled > - Make screen black right after phase 1 initialization finish instead of waiting 5 seconds. It removes black rectangle which appeared for me in explorer. > - Initialize some global variables in inbv.c (it was done by compiler before) > > Modified: > trunk/reactos/ntoskrnl/ex/init.c > trunk/reactos/ntoskrnl/inbv/inbv.c > trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > > Modified: trunk/reactos/ntoskrnl/ex/init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=522… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -1313,7 +1313,7 @@ > size_t Remaining; > PRTL_USER_PROCESS_INFORMATION ProcessInfo; > KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; > - UNICODE_STRING KeyName, DebugString; > + UNICODE_STRING KeyName; > OBJECT_ATTRIBUTES ObjectAttributes; > HANDLE KeyHandle, OptionHandle; > PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; > @@ -1925,18 +1925,19 @@ > /* Update progress bar */ > InbvUpdateProgressBar(100); > > - /* Allow strings to be displayed */ > - InbvEnableDisplayString(TRUE); > - > - /* Wait 5 seconds for it to initialize */ > + /* Disallow strings to be displayed */ > + InbvEnableDisplayString(FALSE); > + > + /* Clean the screen */ > + if (InbvBootDriverInstalled) FinalizeBootLogo(); > + > + /* Wait 5 seconds for initial process to initialize */ > Timeout.QuadPart = Int32x32To64(5, -10000000); > Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); > - if (InbvBootDriverInstalled) FinalizeBootLogo(); > if (Status == STATUS_SUCCESS) > { > /* Failed, display error */ > - RtlInitUnicodeString(&DebugString, L"INIT: Session Manager terminated."); > - ZwDisplayString(&DebugString); > + DPRINT1("INIT: Session Manager terminated.\n"); > > /* Bugcheck the system if SMSS couldn't initialize */ > KeBugCheck(SESSION5_INITIALIZATION_FAILED); > > Modified: trunk/reactos/ntoskrnl/inbv/inbv.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… > ============================================================================== > --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -10,16 +10,16 @@ > KSPIN_LOCK BootDriverLock; > KIRQL InbvOldIrql; > INBV_DISPLAY_STATE InbvDisplayState; > -BOOLEAN InbvBootDriverInstalled; > -BOOLEAN InbvDisplayDebugStrings; > +BOOLEAN InbvBootDriverInstalled = FALSE; > +BOOLEAN InbvDisplayDebugStrings = FALSE; > INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; > ULONG ProgressBarLeft, ProgressBarTop; > -BOOLEAN ShowProgressBar; > +BOOLEAN ShowProgressBar = FALSE; > INBV_PROGRESS_STATE InbvProgressState; > INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; > ULONG ResourceCount; > PUCHAR ResourceList[64]; > -BOOLEAN SysThreadCreated; > +BOOLEAN SysThreadCreated = FALSE; > ROT_BAR_TYPE RotBarSelection; > ULONG PltRotBarStatus; > BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; > > Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Wed Jun 15 12:53:32 2011 > @@ -480,10 +480,18 @@ > KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); > > /* Create Object Types */ > - if (!IopCreateObjectTypes()) return FALSE; > + if (!IopCreateObjectTypes()) > + { > + DPRINT1("IopCreateObjectTypes failed!\n"); > + return FALSE; > + } > > /* Create Object Directories */ > - if (!IopCreateRootDirectories()) return FALSE; > + if (!IopCreateRootDirectories()) > + { > + DPRINT1("IopCreateRootDirectories failed!\n"); > + return FALSE; > + } > > /* Initialize PnP manager */ > IopInitializePlugPlayServices(); > @@ -511,10 +519,19 @@ > IopLoaderBlock = NULL; > > /* Create ARC names for boot devices */ > - if (!NT_SUCCESS(IopCreateArcNames(LoaderBlock))) return FALSE; > + Status = IopCreateArcNames(LoaderBlock); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("IopCreateArcNames failed: %lx\n", Status); > + return FALSE; > + } > > /* Mark the system boot partition */ > - if (!IopMarkBootPartition(LoaderBlock)) return FALSE; > + if (!IopMarkBootPartition(LoaderBlock)) > + { > + DPRINT1("IopMarkBootPartition failed!\n"); > + return FALSE; > + } > > /* Initialize PnP root relations */ > IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); > @@ -539,7 +556,11 @@ > > /* Convert SystemRoot from ARC to NT path */ > Status = IopReassignSystemRoot(LoaderBlock, &NtBootPath); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("IopReassignSystemRoot failed: %lx\n", Status); > + return FALSE; > + } > > /* Set the ANSI_STRING for the root path */ > RootString.MaximumLength = NtSystemRoot.MaximumLength / sizeof(WCHAR); > @@ -550,7 +571,11 @@ > > /* Convert the path into the ANSI_STRING */ > Status = RtlUnicodeStringToAnsiString(&RootString, &NtSystemRoot, FALSE); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("RtlUnicodeStringToAnsiString failed: %lx\n", Status); > + return FALSE; > + } > > /* Assign drive letters */ > IoAssignDriveLetters(LoaderBlock, > @@ -560,10 +585,19 @@ > > /* Update system root */ > Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); > - if (!NT_SUCCESS(Status)) return FALSE; > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("RtlAnsiStringToUnicodeString failed: %lx\n", Status); > + return FALSE; > + } > > /* Load the System DLL and its Entrypoints */ > - if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; > + Status = PsLocateSystemDll(); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("PsLocateSystemDll failed: %lx\n", Status); > + return FALSE; > + } > > /* Return success */ > return TRUE; > >

2 5

Ge Van Geldorp
by Ged Murphy 14 Jun '11

14 Jun '11

Hi all, I write this mail with great sadness, but I've recently been informed that Ge Van Geldorp, one of the original and important contributers to the ReactOS project has recently passed away. Having met up with him personally, I can say with some confidence that he was not only blessed with an impressive skill in the hobby / industry we all love, but was also a man of great integrity. Being one of my original mentors in reactos, and having spent time busting our guts at various linux projects with him trying to convince the unix fanatics of the merits of NT, I can assure you that this he was both a great colleague and friend. I'm sure all the old school reactos devs would more than agree. I propose we have some sort of eulogy on our homepage. I'd be more than willing to compose something. If people would like to send their thoughts, wishes or memories, I'd be more than happy to compile them. Ged.

5 4

[ros-diffs] [pschweitzer] 49851: [DDK] FsRtlRemoveBaseMcbEntry() return is VOID
by Timo Kreuzer 11 Jun '11

11 Jun '11

>Author: pschweitzer >Date: Sun Nov 28 16:43:40 2010 >New Revision: 49851 > >URL:http://svn.reactos.org/svn/reactos?rev=49851&view=rev <http://svn.reactos.org/svn/reactos?rev=49851&view=rev> >Log: >[DDK] >FsRtlRemoveBaseMcbEntry() return is VOID > >Modified: > trunk/reactos/include/ddk/ntifs.h According to WDK this is wrong. Please revert.

1 0

Re: [ros-dev] Ge Van Geldorp
by caemyr＠myopera.com 11 Jun '11

11 Jun '11

Hiya Managed to find Greg brother's letter to Wine, with bit more details regarding this tragedy. Since GvG was also our man, not only Wine's, perhaps some collaborative effort could be set to commemorate him. With best regards Caemyr -------- Original Message -------- Subject: Date: From: To: RE: Ge van Geldorp Thu, 9 Jun 2011 23:05:46 +0200 Erven Gé van Geldorp <erven.van.geldorp <at> gmail.com> 'Paul Vriens' <paul.vriens.wine <at> gmail.com> Hi all, My name is Arno van Geldorp. I’m the brother of Gé (Greg) van Geldorp. I’m very sorry that I have to inform you that Greg has passed away almost 3 weeks ago. 2 Months earlier he was diagnosed with cancer in a very aggressive form. I know he made his contribution to the Wine project. And that one of them is the WineTestBot. His passing away went so fast that he didn’t have the time to inform me all about it. What he did ask me is to make sure that the server where the WineTestBot is running on will be hosted for at least 2 more years. So we will take care of that. But I don’t know if anyone took over the administration off the server. If anyone took over the administration from Greg could you please contact me at erven.van.geldorp at gmail.com Kind regards, Arno van Geldorp

1 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 52133: [OBJ2BIN] - Add new tool obj2bin, that converts a coff object file into a raw binary file - Move pe/coff types into a common header file pecoff.h
by Alex Ionescu 09 Jun '11

09 Jun '11

Why is this needed? ie: what missing functionality of obj2dump does this tool add? I'm only asking because whenever I build ARM binaries with GCC I use obj2dump to do exactly this -- convert a PE/COFF to a raw binary for the boot-loader or firmware. So maybe I'm missing something? Best regards, Alex Ionescu On Tue, Jun 7, 2011 at 3:29 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Tue Jun 7 19:29:09 2011 > New Revision: 52133 > > URL: http://svn.reactos.org/svn/reactos?rev=52133&view=rev > Log: > [OBJ2BIN] > - Add new tool obj2bin, that converts a coff object file into a raw binary file > - Move pe/coff types into a common header file pecoff.h > > Added: > trunk/reactos/tools/obj2bin/ (with props) > trunk/reactos/tools/obj2bin/CMakeLists.txt (with props) > trunk/reactos/tools/obj2bin/obj2bin.c (with props) > trunk/reactos/tools/pecoff.h (with props) > Modified: > trunk/reactos/tools/CMakeLists.txt > trunk/reactos/tools/rsym/rsym.h > > Modified: trunk/reactos/tools/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… > ============================================================================== > --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -6,6 +6,7 @@ > add_subdirectory(gendib) > add_subdirectory(geninc) > add_subdirectory(mkhive) > +add_subdirectory(obj2bin) > add_subdirectory(spec2def) > add_subdirectory(unicode) > > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > --- bugtraq:logregex (added) > +++ bugtraq:logregex Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,2 @@ > +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? > +(\d+) > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:message = See issue #%BUGID% for more details. > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% > > Propchange: trunk/reactos/tools/obj2bin/ > ------------------------------------------------------------------------------ > tsvn:logminsize = 10 > > Added: trunk/reactos/tools/obj2bin/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/CMakeLists.t… > ============================================================================== > --- trunk/reactos/tools/obj2bin/CMakeLists.txt (added) > +++ trunk/reactos/tools/obj2bin/CMakeLists.txt [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,1 @@ > +add_executable(obj2bin obj2bin.c) > > Propchange: trunk/reactos/tools/obj2bin/CMakeLists.txt > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/obj2bin/obj2bin.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… > ============================================================================== > --- trunk/reactos/tools/obj2bin/obj2bin.c (added) > +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,112 @@ > +#include <stdio.h> > +#include <stdlib.h> > +#include "../pecoff.h" > + > +static > +void > +Usage(void) > +{ > + printf("Converts a coff object file into a raw binary file.\n" > + "Syntax: obj2bin <source file> <dest file>\n"); > +} > + > +int main(int argc, char *argv[]) > +{ > + char *pszSourceFile; > + char *pszDestFile; > + FILE *pSourceFile, *pDestFile; > + IMAGE_FILE_HEADER FileHeader; > + IMAGE_SECTION_HEADER SectionHeader; > + unsigned int i, nSize; > + void *pData; > + > + if ((argc != 3) || (strcmp(argv[1], "--help") == 0)) Usage(); > + > + pszSourceFile = argv[1]; > + pszDestFile = argv[2]; > + > + pSourceFile = fopen(pszSourceFile, "rb"); > + if (!pSourceFile) > + { > + fprintf(stderr, "Couldn't open source file '%s'\n", pszSourceFile); > + return -1; > + } > + > + pDestFile = fopen(pszDestFile, "wb"); > + if (!pszDestFile) > + { > + fprintf(stderr, "Couldn't open dest file '%s'\n", pszDestFile); > + return -2; > + } > + > + /* Load the coff header */ > + nSize = fread(&FileHeader, 1, sizeof(FileHeader), pSourceFile); > + if (nSize != sizeof(FileHeader)) > + { > + fprintf(stderr, "Failed to read source file\n"); > + return -3; > + } > + > + /* Jump to section headers (skip optional header) */ > + if (fseek(pSourceFile, FileHeader.SizeOfOptionalHeader, SEEK_CUR)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -4; > + } > + > + /* Loop all sections */ > + for (i = 0; i < FileHeader.NumberOfSections; i++) > + { > + /* Read section header */ > + nSize = fread(&SectionHeader, 1, sizeof(SectionHeader), pSourceFile); > + if (nSize != sizeof(SectionHeader)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Check if this is '.text' section */ > + if (strcmp(SectionHeader.Name, ".text") == 0) break; > + } > + > + if (i == FileHeader.NumberOfSections) > + { > + fprintf(stderr, "No .text section found\n"); > + return -6; > + } > + > + /* Move file pointer to the start of the section*/ > + if (fseek(pSourceFile, SectionHeader.PointerToRawData, SEEK_SET)) > + { > + fprintf(stderr, "Failed to set file pointer\n"); > + return -7; > + } > + > + /* Allocate memory for the section */ > + pData = malloc(SectionHeader.SizeOfRawData); > + if (!pData) > + { > + fprintf(stderr, "Failed to allocate %ld bytes\n", SectionHeader.SizeOfRawData); > + return -8; > + } > + > + /* Read section data */ > + if (!fread(pData, SectionHeader.SizeOfRawData, 1, pSourceFile)) > + { > + fprintf(stderr, "Failed to read section %ld file\n", i); > + return -5; > + } > + > + /* Write the section to the destination file */ > + if (!fwrite(pData, SectionHeader.SizeOfRawData, 1, pDestFile)) > + { > + fprintf(stderr, "Failed to write data\n"); > + return -9; > + } > + > + fclose(pDestFile); > + fclose(pSourceFile); > + > + return 0; > +} > + > > Propchange: trunk/reactos/tools/obj2bin/obj2bin.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Added: trunk/reactos/tools/pecoff.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pecoff.h?rev=52133&v… > ============================================================================== > --- trunk/reactos/tools/pecoff.h (added) > +++ trunk/reactos/tools/pecoff.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,0 +1,207 @@ > +#pragma once > + > +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > + > +#define IMAGE_DOS_MAGIC 0x5a4d > +#define IMAGE_PE_MAGIC 0x00004550 > +#define IMAGE_SIZEOF_SHORT_NAME 8 > + > +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > + > +#define IMAGE_FILE_MACHINE_I386 0x14c > +#define IMAGE_FILE_MACHINE_AMD64 0x8664 > +#define IMAGE_FILE_MACHINE_IA64 0x0200 > + > +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > + > +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > +#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > +#define IMAGE_SCN_CNT_CODE 0x00000020 > +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > +#define IMAGE_SCN_LNK_OTHER 0x00000100 > +#define IMAGE_SCN_LNK_INFO 0x00000200 > +#define IMAGE_SCN_LNK_REMOVE 0x00000800 > +#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > +#define IMAGE_SCN_GPREL 0x00008000 > +#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > +#define IMAGE_SCN_MEM_LOCKED 0x00040000 > +#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > +#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > +#define IMAGE_SCN_MEM_SHARED 0x10000000 > +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > +#define IMAGE_SCN_MEM_READ 0x40000000 > +#define IMAGE_SCN_MEM_WRITE 0x80000000 > + > +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > + > +typedef unsigned char BYTE; > +typedef unsigned char UCHAR; > +typedef unsigned short WORD; > +typedef unsigned short USHORT; > +typedef unsigned long long ULONGLONG; > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef signed int LONG; > +typedef unsigned int ULONG; > +typedef unsigned int DWORD; > +#else > +typedef signed long LONG; > +typedef unsigned long ULONG; > +typedef unsigned long DWORD; > +#endif > +#if defined(_WIN64) > +typedef unsigned __int64 ULONG_PTR; > +#else > +#if defined(__x86_64__) && !defined(_WIN64) > +typedef unsigned int ULONG_PTR; > +#else > +typedef unsigned long ULONG_PTR; > +#endif > +#endif > + > +#pragma pack(push,2) > +typedef struct _IMAGE_DOS_HEADER { > + WORD e_magic; > + WORD e_cblp; > + WORD e_cp; > + WORD e_crlc; > + WORD e_cparhdr; > + WORD e_minalloc; > + WORD e_maxalloc; > + WORD e_ss; > + WORD e_sp; > + WORD e_csum; > + WORD e_ip; > + WORD e_cs; > + WORD e_lfarlc; > + WORD e_ovno; > + WORD e_res[4]; > + WORD e_oemid; > + WORD e_oeminfo; > + WORD e_res2[10]; > + LONG e_lfanew; > +} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > +#pragma pack(pop) > + > +#pragma pack(push,4) > +typedef struct _IMAGE_FILE_HEADER { > + WORD Machine; > + WORD NumberOfSections; > + DWORD TimeDateStamp; > + DWORD PointerToSymbolTable; > + DWORD NumberOfSymbols; > + WORD SizeOfOptionalHeader; > + WORD Characteristics; > +} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > +#pragma pack(pop) > + > +typedef struct _IMAGE_DATA_DIRECTORY { > + DWORD VirtualAddress; > + DWORD Size; > +} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > + > +typedef struct _IMAGE_OPTIONAL_HEADER32 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + DWORD BaseOfData; > + DWORD ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + DWORD SizeOfStackReserve; > + DWORD SizeOfStackCommit; > + DWORD SizeOfHeapReserve; > + DWORD SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > + > +typedef struct _IMAGE_OPTIONAL_HEADER64 { > + WORD Magic; > + BYTE MajorLinkerVersion; > + BYTE MinorLinkerVersion; > + DWORD SizeOfCode; > + DWORD SizeOfInitializedData; > + DWORD SizeOfUninitializedData; > + DWORD AddressOfEntryPoint; > + DWORD BaseOfCode; > + ULONGLONG ImageBase; > + DWORD SectionAlignment; > + DWORD FileAlignment; > + WORD MajorOperatingSystemVersion; > + WORD MinorOperatingSystemVersion; > + WORD MajorImageVersion; > + WORD MinorImageVersion; > + WORD MajorSubsystemVersion; > + WORD MinorSubsystemVersion; > + DWORD Win32VersionValue; > + DWORD SizeOfImage; > + DWORD SizeOfHeaders; > + DWORD CheckSum; > + WORD Subsystem; > + WORD DllCharacteristics; > + ULONGLONG SizeOfStackReserve; > + ULONGLONG SizeOfStackCommit; > + ULONGLONG SizeOfHeapReserve; > + ULONGLONG SizeOfHeapCommit; > + DWORD LoaderFlags; > + DWORD NumberOfRvaAndSizes; > + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > +} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > + > +#ifdef _TARGET_PE64 > +typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > +#else > +typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > +typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > +#endif > + > +typedef struct _IMAGE_SECTION_HEADER { > + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > + union { > + DWORD PhysicalAddress; > + DWORD VirtualSize; > + } Misc; > + DWORD VirtualAddress; > + DWORD SizeOfRawData; > + DWORD PointerToRawData; > + DWORD PointerToRelocations; > + DWORD PointerToLinenumbers; > + WORD NumberOfRelocations; > + WORD NumberOfLinenumbers; > + DWORD Characteristics; > +} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > + > +#pragma pack(push,4) > +typedef struct _IMAGE_BASE_RELOCATION { > + DWORD VirtualAddress; > + DWORD SizeOfBlock; > + WORD TypeOffset[1]; > +} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > +#pragma pack(pop) > + > > Propchange: trunk/reactos/tools/pecoff.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/tools/rsym/rsym.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=5213… > ============================================================================== > --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) > +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Tue Jun 7 19:29:09 2011 > @@ -1,209 +1,7 @@ > /* rsym.h */ > > #pragma once > - > -#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b > -#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b > - > -#define IMAGE_DOS_MAGIC 0x5a4d > -#define IMAGE_PE_MAGIC 0x00004550 > -#define IMAGE_SIZEOF_SHORT_NAME 8 > - > -#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 > -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 > -#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 > - > -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 > - > -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 > -#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 > -#define IMAGE_SCN_CNT_CODE 0x00000020 > -#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 > -#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 > -#define IMAGE_SCN_LNK_OTHER 0x00000100 > -#define IMAGE_SCN_LNK_INFO 0x00000200 > -#define IMAGE_SCN_LNK_REMOVE 0x00000800 > -#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 > -#define IMAGE_SCN_GPREL 0x00008000 > -#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 > -#define IMAGE_SCN_MEM_LOCKED 0x00040000 > -#define IMAGE_SCN_MEM_PRELOAD 0x00080000 > -#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 > -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 > -#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 > -#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 > -#define IMAGE_SCN_MEM_SHARED 0x10000000 > -#define IMAGE_SCN_MEM_EXECUTE 0x20000000 > -#define IMAGE_SCN_MEM_READ 0x40000000 > -#define IMAGE_SCN_MEM_WRITE 0x80000000 > - > -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 > - > -typedef unsigned char BYTE; > -typedef unsigned char UCHAR; > -typedef unsigned short WORD; > -typedef unsigned short USHORT; > -typedef unsigned long long ULONGLONG; > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef signed int LONG; > -typedef unsigned int ULONG; > -typedef unsigned int DWORD; > -#else > -typedef signed long LONG; > -typedef unsigned long ULONG; > -typedef unsigned long DWORD; > -#endif > -#if defined(_WIN64) > -typedef unsigned __int64 ULONG_PTR; > -#else > -#if defined(__x86_64__) && !defined(_WIN64) > -typedef unsigned int ULONG_PTR; > -#else > -typedef unsigned long ULONG_PTR; > -#endif > -#endif > - > -#pragma pack(push,2) > - > -typedef struct _IMAGE_DOS_HEADER { > - WORD e_magic; > - WORD e_cblp; > - WORD e_cp; > - WORD e_crlc; > - WORD e_cparhdr; > - WORD e_minalloc; > - WORD e_maxalloc; > - WORD e_ss; > - WORD e_sp; > - WORD e_csum; > - WORD e_ip; > - WORD e_cs; > - WORD e_lfarlc; > - WORD e_ovno; > - WORD e_res[4]; > - WORD e_oemid; > - WORD e_oeminfo; > - WORD e_res2[10]; > - LONG e_lfanew; > -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; > -#pragma pack(pop) > - > -#pragma pack(push,4) > -typedef struct _IMAGE_FILE_HEADER { > - WORD Machine; > - WORD NumberOfSections; > - DWORD TimeDateStamp; > - DWORD PointerToSymbolTable; > - DWORD NumberOfSymbols; > - WORD SizeOfOptionalHeader; > - WORD Characteristics; > -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; > -#pragma pack(pop) > - > -typedef struct _IMAGE_DATA_DIRECTORY { > - DWORD VirtualAddress; > - DWORD Size; > -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; > - > -typedef struct _IMAGE_OPTIONAL_HEADER32 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - DWORD BaseOfData; > - DWORD ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - DWORD SizeOfStackReserve; > - DWORD SizeOfStackCommit; > - DWORD SizeOfHeapReserve; > - DWORD SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; > - > -typedef struct _IMAGE_OPTIONAL_HEADER64 { > - WORD Magic; > - BYTE MajorLinkerVersion; > - BYTE MinorLinkerVersion; > - DWORD SizeOfCode; > - DWORD SizeOfInitializedData; > - DWORD SizeOfUninitializedData; > - DWORD AddressOfEntryPoint; > - DWORD BaseOfCode; > - ULONGLONG ImageBase; > - DWORD SectionAlignment; > - DWORD FileAlignment; > - WORD MajorOperatingSystemVersion; > - WORD MinorOperatingSystemVersion; > - WORD MajorImageVersion; > - WORD MinorImageVersion; > - WORD MajorSubsystemVersion; > - WORD MinorSubsystemVersion; > - DWORD Win32VersionValue; > - DWORD SizeOfImage; > - DWORD SizeOfHeaders; > - DWORD CheckSum; > - WORD Subsystem; > - WORD DllCharacteristics; > - ULONGLONG SizeOfStackReserve; > - ULONGLONG SizeOfStackCommit; > - ULONGLONG SizeOfHeapReserve; > - ULONGLONG SizeOfHeapCommit; > - DWORD LoaderFlags; > - DWORD NumberOfRvaAndSizes; > - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; > -} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; > - > - > -#ifdef _TARGET_PE64 > -typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; > -#else > -typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; > -typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; > -#endif > - > -typedef struct _IMAGE_SECTION_HEADER { > - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; > - union { > - DWORD PhysicalAddress; > - DWORD VirtualSize; > - } Misc; > - DWORD VirtualAddress; > - DWORD SizeOfRawData; > - DWORD PointerToRawData; > - DWORD PointerToRelocations; > - DWORD PointerToLinenumbers; > - WORD NumberOfRelocations; > - WORD NumberOfLinenumbers; > - DWORD Characteristics; > -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; > - > -#pragma pack(push,4) > -typedef struct _IMAGE_BASE_RELOCATION { > - DWORD VirtualAddress; > - DWORD SizeOfBlock; > - WORD TypeOffset[1]; > -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; > -#pragma pack(pop) > +#include "../pecoff.h" > > typedef struct { > USHORT f_magic; /* magic number */ > > >

3 6

Re: [ros-dev] [ros-diffs] [tkreuzer] 52156: [BOOTSECTOR] - export obj2bin on gcc builds, too - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors wi...
by Timo Kreuzer 09 Jun '11

09 Jun '11

Am 09.06.2011 15:56, schrieb tkreuzer(a)svn.reactos.org: > Author: tkreuzer > Date: Thu Jun 9 13:56:44 2011 > New Revision: 52156 > > URL: http://svn.reactos.org/svn/reactos?rev=52156&view=rev > Log: > [BOOTSECTOR] > - export obj2bin on gcc builds, too > - Add new macro CreateBootSectorTarget2, which uses portable assembly and use it with isoboot.S. I will replace all bootsectors with the new code one at a time, and in the end we can eventually drop nmake > - add wrapper isobtrt.S, which defines ROS_REGTEST and includes isoboot.S > I mean of course "drop nasm" not "drop nmake"

1 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 52065: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopR...
by Alex Ionescu 07 Jun '11

07 Jun '11

The notification routine can change the list, as there is no lock involved. Therefore, you should grab the next entry before notifying the driver, to maintain a consistent list state. -- Best regards, Alex Ionescu On 2011-06-02, at 1:43 PM, pschweitzer(a)svn.reactos.org wrote: > + DriverNotificationRoutine(DeviceObject, TRUE); > + > + /* Go to the next entry */ > + ListEntry = ListEntry->Flink;

4 15

Re: [ros-dev] [ros-diffs] [cgutman] 52125: [AFD] - Fix IoModifyAccess vs IoReadAccess confusion
by Timo Kreuzer 07 Jun '11

07 Jun '11

I can't get the logic behind this change. Can you explain? Am 07.06.2011 00:55, schrieb cgutman(a)svn.reactos.org: > Author: cgutman > Date: Mon Jun 6 22:55:17 2011 > New Revision: 52125 > > URL: http://svn.reactos.org/svn/reactos?rev=52125&view=rev > Log: > [AFD] > - Fix IoModifyAccess vs IoReadAccess confusion > > Modified: > trunk/reactos/drivers/network/afd/afd/lock.c > > Modified: trunk/reactos/drivers/network/afd/afd/lock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… > ============================================================================== > --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Jun 6 22:55:17 2011 > @@ -123,7 +123,7 @@ > AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); > _SEH2_TRY { > MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, > - Write ? IoModifyAccess : IoReadAccess ); > + Write ? IoReadAccess : IoModifyAccess ); > } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { > LockFailed = TRUE; > } _SEH2_END; > > >

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev