Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29334: - Almost completely fix the hack in IopParseDevice which was resulting in "FIXME: Broken Parse due to invalid DesiredAccess" messages, by changing some calls to IoGetDeviceObjectPointer to use FILE_READ_ATTRIBUTES instead of FILE_READ_DATA (so that the volume doesn't get mounted).
by fireball＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: fireball Date: Mon Oct 1 22:04:42 2007 New Revision: 29334 URL: http://svn.reactos.org/svn/reactos?rev=29334&view=rev Log: - Almost completely fix the hack in IopParseDevice which was resulting in "FIXME: Broken Parse due to invalid DesiredAccess" messages, by changing some calls to IoGetDeviceObjectPointer to use FILE_READ_ATTRIBUTES instead of FILE_READ_DATA (so that the volume doesn't get mounted). Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c (contents, props changed) trunk/reactos/ntoskrnl/io/iomgr/file.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Mon Oct 1 22:04:42 2007 @@ -305,7 +305,7 @@ /* Get the drives sector size */ Status = IoGetDeviceObjectPointer(DeviceName, - FILE_READ_DATA, + FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); if (!NT_SUCCESS(Status)) @@ -481,10 +481,10 @@ NULL); Status = ZwOpenFile(&FileHandle, - 0x10001, + FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - 1, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 1 22:04:42 2007 @@ -154,7 +154,7 @@ /* Get the device pointer */ Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_DATA, + FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); *DiskDeviceObject = DeviceObject; Propchange: trunk/reactos/ntoskrnl/io/iomgr/arcname.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Oct 1 22:04:42 2007 @@ -390,27 +390,15 @@ /* Check if this is a direct open */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && -#if 0 // USETUP IS BROKEN! - ((DesiredAccess & ~(SYNCHRONIZE | - FILE_READ_ATTRIBUTES | - READ_CONTROL | - ACCESS_SYSTEM_SECURITY | - WRITE_OWNER | - WRITE_DAC)) && -#endif + (((DesiredAccess & ~(SYNCHRONIZE | + FILE_READ_ATTRIBUTES | + READ_CONTROL | + ACCESS_SYSTEM_SECURITY | + WRITE_OWNER | + WRITE_DAC)) == 0) || + (wcsstr(CompleteName->Buffer, L"Harddisk"))) && !(UseDummyFile)) { - if (DesiredAccess & ~(SYNCHRONIZE | - FILE_READ_ATTRIBUTES | - READ_CONTROL | - ACCESS_SYSTEM_SECURITY | - WRITE_OWNER | - WRITE_DAC)) - { - DPRINT1("FIXME: Broken Parse due to invalid DesiredAccess: %lx\n", - DesiredAccess); - } - /* Remember this for later */ DirectOpen = TRUE; } Propchange: trunk/reactos/ntoskrnl/io/iomgr/file.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 29333: Display error location when possible
by hpoussin＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: hpoussin Date: Mon Oct 1 22:02:45 2007 New Revision: 29333 URL: http://svn.reactos.org/svn/reactos?rev=29333&view=rev Log: Display error location when possible Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Oct 1 22:02:45 2007 @@ -3221,7 +3221,9 @@ if ( m.bootstrap != NULL ) { FileLocation targetFile ( OutputDirectory, - bootcdDirectory + sSep + m.bootstrap->base, + m.bootstrap->base.length () > 0 + ? bootcdDirectory + sSep + m.bootstrap->base + : bootcdDirectory, m.bootstrap->nameoncd ); OutputCopyCommand ( *m.output, targetFile ); } @@ -3256,7 +3258,9 @@ if ( m.bootstrap != NULL ) { FileLocation targetDirectory ( OutputDirectory, - bootcdDirectory + sSep + m.bootstrap->base, + m.bootstrap->base.length () > 0 + ? bootcdDirectory + sSep + m.bootstrap->base + : bootcdDirectory, "" ); out.push_back ( targetDirectory ); } Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Mon Oct 1 22:02:45 2007 @@ -50,8 +50,10 @@ source = new FileLocation ( SourceDirectory, path, - cdfileNode.value ); + cdfileNode.value, + &cdfileNode ); target = new FileLocation ( OutputDirectory, target_relative_directory, - nameoncd ? att->value : cdfileNode.value ); + nameoncd ? att->value : cdfileNode.value, + &cdfileNode ); } Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Mon Oct 1 22:02:45 2007 @@ -102,7 +102,8 @@ { return new FileLocation ( IntermediateDirectory, module ? module->output->relative_path : "", - local_name ); + local_name, + node ); } File* file = files[0]; Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Oct 1 22:02:45 2007 @@ -108,7 +108,8 @@ directory = new FileLocation ( root, relative_path, - "" ); + "", + node ); } DirectoryLocation Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Mon Oct 1 22:02:45 2007 @@ -49,12 +49,14 @@ source = new FileLocation ( source_directory, path, - node.value ); + node.value, + &node ); target = new FileLocation ( InstallDirectory, base && base->value != "." ? base->value : "", newname ? newname->value - : node.value ); + : node.value, + &node ); } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Oct 1 22:02:45 2007 @@ -280,7 +280,8 @@ output = new FileLocation ( GetTargetDirectoryTree (), modulePath, - name + extension ); + name + extension, + &moduleNode ); att = moduleNode.GetAttribute ( "unicode", false ); if ( att != NULL ) @@ -408,7 +409,8 @@ const XMLAttribute* installbase = moduleNode.GetAttribute ( "installbase", false ); install = new FileLocation ( InstallDirectory, installbase ? installbase->value : "", - att->value ); + att->value, + &moduleNode ); } else install = NULL; @@ -774,14 +776,14 @@ if ( pos == string::npos ) { pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value ) ); + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); } else { string dir = e.value.substr ( 0, pos ); string name = e.value.substr ( pos + 1); pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name ) ); + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); } subs_invalid = true; } @@ -1556,7 +1558,8 @@ { source = new FileLocation ( directory, module.output->relative_path, - definition->value ); + definition->value, + &node ); } else { @@ -1564,7 +1567,8 @@ string name = definition->value.substr ( index + 1); source = new FileLocation ( directory, NormalizeFilename ( module.output->relative_path + sSep + dir ), - name ); + name, + &node ); } } Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Oct 1 22:02:45 2007 @@ -101,7 +101,8 @@ FileLocation::FileLocation ( const DirectoryLocation directory, const std::string& relative_path, - const std::string& name ) + const std::string& name, + const XMLElement *node ) : directory ( directory ), relative_path ( NormalizeFilename ( relative_path ) ), name ( name ) @@ -114,18 +115,32 @@ ( relative_path.length () > 3 && relative_path.find ( ':' ) != string::npos ) ) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid relative path '%s'", - relative_path.c_str () ); + if ( node ) + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s' at %s", + relative_path.c_str (), + node->location.c_str () ); + else + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s'", + relative_path.c_str () ); } if ( name.find_first_of ( "/\\:" ) != string::npos ) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid file name '%s'", - name.c_str () ); + if ( node ) + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid file name '%s' at %s", + name.c_str (), + node->location.c_str () ); + else + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid file name '%s'", + name.c_str () ); } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Oct 1 22:02:45 2007 @@ -316,7 +316,8 @@ FileLocation ( const DirectoryLocation directory, const std::string& relative_path, - const std::string& name ); + const std::string& name, + const XMLElement *node = NULL ); FileLocation ( const FileLocation& other ); };

1 0

[fireball] 29332: - KeRosCaptureUserStackBackTrace is now created, which calls RtlWalkFrameChain with the user-mode flag, meaning that bugchecks finally show the user-mode stack again! - KeRosDumpStackFrames is fixed so that if the EIP can't be found in a module list, it's still displayed (just without the module name). Previously the EIP would not be shown, resulting in code running on the heap/stack/somewhere else not being shown as part of the trace.
by fireball＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: fireball Date: Mon Oct 1 21:58:49 2007 New Revision: 29332 URL: http://svn.reactos.org/svn/reactos?rev=29332&view=rev Log: - KeRosCaptureUserStackBackTrace is now created, which calls RtlWalkFrameChain with the user-mode flag, meaning that bugchecks finally show the user-mode stack again! - KeRosDumpStackFrames is fixed so that if the EIP can't be found in a module list, it's still displayed (just without the module name). Previously the EIP would not be shown, resulting in code running on the heap/stack/somewhere else not being shown as part of the trace. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c (contents, props changed) trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c Mon Oct 1 21:58:49 2007 @@ -14,6 +14,19 @@ #include <debug.h> /* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + /* Not implemented for user-mode */ + return 0; +} BOOLEAN NTAPI Propchange: trunk/reactos/dll/ntdll/rtl/libsupp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Oct 1 21:58:49 2007 @@ -449,6 +449,15 @@ // Tracing Functions // NTSYSAPI +ULONG +NTAPI +RtlWalkFrameChain( + OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags +); + +NTSYSAPI USHORT NTAPI RtlLogStackBackTrace( Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=29… ============================================================================== --- trunk/reactos/lib/rtl/exception.c (original) +++ trunk/reactos/lib/rtl/exception.c Mon Oct 1 21:58:49 2007 @@ -116,110 +116,6 @@ /* * @implemented */ -ULONG -NTAPI -RtlWalkFrameChain(OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags) -{ - ULONG_PTR Stack, NewStack, StackBegin, StackEnd; - ULONG Eip; - BOOLEAN Result, StopSearch = FALSE; - ULONG i = 0; - - /* Get current EBP */ -#if defined(_M_IX86) -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Stack) : ); -#elif defined(_MSC_VER) - __asm mov Stack, ebp -#endif -#elif defined(_M_MIPS) - __asm__("move $sp, %0" : "=r" (Stack) : ); -#elif defined(_M_PPC) - __asm__("mr %0,1" : "=r" (Stack) : ); -#else -#error Unknown architecture -#endif - - /* Set it as the stack begin limit as well */ - StackBegin = (ULONG_PTR)Stack; - - /* Check if we're called for non-logging mode */ - if (!Flags) - { - /* Get the actual safe limits */ - Result = RtlpCaptureStackLimits((ULONG_PTR)Stack, - &StackBegin, - &StackEnd); - if (!Result) return 0; - } - - /* Use a SEH block for maximum protection */ - _SEH_TRY - { - /* Loop the frames */ - for (i = 0; i < Count; i++) - { - /* - * Leave if we're past the stack, - * if we're before the stack, - * or if we've reached ourselves. - */ - if ((Stack >= StackEnd) || - (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || - ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) - { - /* We're done or hit a bad address */ - break; - } - - /* Get new stack and EIP */ - NewStack = *(PULONG_PTR)Stack; - Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); - - /* Check if the new pointer is above the oldone and past the end */ - if (!((Stack < NewStack) && (NewStack < StackEnd))) - { - /* Stop searching after this entry */ - StopSearch = TRUE; - } - - /* Also make sure that the EIP isn't a stack address */ - if ((StackBegin < Eip) && (Eip < StackEnd)) break; - - /* Check if we reached a user-mode address */ - if (!(Flags) && !(Eip & 0x80000000)) break; - - /* Save this frame */ - Callers[i] = (PVOID)Eip; - - /* Check if we should continue */ - if (StopSearch) - { - /* Return the next index */ - i++; - break; - } - - /* Move to the next stack */ - Stack = NewStack; - } - } - _SEH_HANDLE - { - /* No index */ - i = 0; - } - _SEH_END; - - /* Return frames parsed */ - return i; -} - -/* - * @implemented - */ USHORT NTAPI RtlCaptureStackBackTrace(IN ULONG FramesToSkip, Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2933… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Oct 1 21:58:49 2007 @@ -136,6 +136,97 @@ return(FALSE); } +PVOID +NTAPI +KiRosPcToUserFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) +{ + PVOID ImageBase, EipBase = NULL; + PLDR_DATA_TABLE_ENTRY Entry; + PLIST_ENTRY ListHead, NextEntry; + + /* + * We know this is valid because we should only be called after a + * succesfull address from RtlWalkFrameChain for UserMode, which + * validates everything for us. + */ + ListHead = &KeGetCurrentThread()-> + Teb->ProcessEnvironmentBlock->Ldr->InLoadOrderModuleList; + + /* Set list pointers and make sure it's valid */ + NextEntry = ListHead->Flink; + if (NextEntry) + { + /* Start loop */ + while (NextEntry != ListHead) + { + /* Get the loader entry */ + Entry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + ImageBase = Entry->DllBase; + + /* Check if this is the right one */ + if (((ULONG_PTR)Eip >= (ULONG_PTR)Entry->DllBase) && + ((ULONG_PTR)Eip < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) + { + /* Return this entry */ + *LdrEntry = Entry; + EipBase = ImageBase; + break; + } + } + } + + /* Return the base address */ + return EipBase; +} + +USHORT +NTAPI +KeRosCaptureUserStackBackTrace(IN ULONG FramesToSkip, + IN ULONG FramesToCapture, + OUT PVOID *BackTrace, + OUT PULONG BackTraceHash OPTIONAL) +{ + PVOID Frames[2 * 64]; + ULONG FrameCount; + ULONG Hash = 0, i; + + /* Skip a frame for the caller */ + FramesToSkip++; + + /* Don't go past the limit */ + if ((FramesToCapture + FramesToSkip) >= 128) return 0; + + /* Do the back trace */ + FrameCount = RtlWalkFrameChain(Frames, FramesToCapture + FramesToSkip, 1); + + /* Make sure we're not skipping all of them */ + if (FrameCount <= FramesToSkip) return 0; + + /* Loop all the frames */ + for (i = 0; i < FramesToCapture; i++) + { + /* Don't go past the limit */ + if ((FramesToSkip + i) >= FrameCount) break; + + /* Save this entry and hash it */ + BackTrace[i] = Frames[FramesToSkip + i]; + Hash += PtrToUlong(BackTrace[i]); + } + + /* Write the hash */ + if (BackTraceHash) *BackTraceHash = Hash; + + /* Clear the other entries and return count */ + RtlFillMemoryUlong(Frames, 128, 0); + return (USHORT)i; +} + VOID NTAPI KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, @@ -176,7 +267,38 @@ Addr -= (ULONG_PTR)LdrEntry->DllBase; DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); } - + else if (Addr) + { + /* Print only the address */ + DbgPrint("<%x>", Addr); + } + + /* Go to the next frame */ + DbgPrint("\n"); + } + + /* Get the current frames */ + FrameCount = KeRosCaptureUserStackBackTrace(-1, 32, (PVOID*)Frames, NULL); + + /* Now loop them */ + for (i = 0; i < FrameCount; i++) + { + /* Get the EIP */ + Addr = Frames[i]; + + /* Get the base for this file */ + if (KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry)) + { + /* Print out the module name */ + Addr -= (ULONG_PTR)LdrEntry->DllBase; + DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); + } + else if (Addr) + { + /* Print only the address */ + DbgPrint("<%x>", Addr); + } + /* Go to the next frame */ DbgPrint("\n"); } Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Mon Oct 1 21:58:49 2007 @@ -255,6 +255,144 @@ return TRUE; } +/* + * @implemented + */ +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + ULONG_PTR Stack, NewStack, StackBegin, StackEnd; + ULONG Eip; + BOOLEAN Result, StopSearch = FALSE; + ULONG i = 0; + PKTHREAD Thread = KeGetCurrentThread(); + PTEB Teb; + PKTRAP_FRAME TrapFrame; + + /* Get current EBP */ +#if defined(_M_IX86) +#if defined __GNUC__ + __asm__("mov %%ebp, %0" : "=r" (Stack) : ); +#elif defined(_MSC_VER) + __asm mov Stack, ebp +#endif +#elif defined(_M_MIPS) + __asm__("move $sp, %0" : "=r" (Stack) : ); +#elif defined(_M_PPC) + __asm__("mr %0,1" : "=r" (Stack) : ); +#else +#error Unknown architecture +#endif + + /* Set it as the stack begin limit as well */ + StackBegin = (ULONG_PTR)Stack; + + /* Check if we're called for non-logging mode */ + if (!Flags) + { + /* Get the actual safe limits */ + Result = RtlpCaptureStackLimits((ULONG_PTR)Stack, + &StackBegin, + &StackEnd); + if (!Result) return 0; + } + + /* Use a SEH block for maximum protection */ + _SEH_TRY + { + /* Check if we want the user-mode stack frame */ + if (Flags == 1) + { + /* Get the trap frame and TEB */ + TrapFrame = Thread->TrapFrame; + Teb = Thread->Teb; + + /* Make sure we can trust the TEB and trap frame */ + if (!(Teb) || + !((PVOID)((ULONG_PTR)TrapFrame & 0x80000000)) || + ((PVOID)TrapFrame <= (PVOID)Thread->StackLimit) || + ((PVOID)TrapFrame >= (PVOID)Thread->StackBase) || + (KeIsAttachedProcess()) || + (KeGetCurrentIrql() >= DISPATCH_LEVEL)) + { + /* Invalid or unsafe attempt to get the stack */ + return 0; + } + + /* Get the stack limits */ + StackBegin = (ULONG_PTR)Teb->Tib.StackLimit; + StackEnd = (ULONG_PTR)Teb->Tib.StackBase; + Stack = TrapFrame->Ebp; + + /* Validate them */ + if (StackEnd <= StackBegin) return 0; + ProbeForRead((PVOID)StackBegin, + StackEnd - StackBegin, + sizeof(CHAR)); + } + + /* Loop the frames */ + for (i = 0; i < Count; i++) + { + /* + * Leave if we're past the stack, + * if we're before the stack, + * or if we've reached ourselves. + */ + if ((Stack >= StackEnd) || + (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || + ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) + { + /* We're done or hit a bad address */ + break; + } + + /* Get new stack and EIP */ + NewStack = *(PULONG_PTR)Stack; + Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); + + /* Check if the new pointer is above the oldone and past the end */ + if (!((Stack < NewStack) && (NewStack < StackEnd))) + { + /* Stop searching after this entry */ + StopSearch = TRUE; + } + + /* Also make sure that the EIP isn't a stack address */ + if ((StackBegin < Eip) && (Eip < StackEnd)) break; + + /* Check if we reached a user-mode address */ + if (!(Flags) && !(Eip & 0x80000000)) break; + + /* Save this frame */ + Callers[i] = (PVOID)Eip; + + /* Check if we should continue */ + if (StopSearch) + { + /* Return the next index */ + i++; + break; + } + + /* Move to the next stack */ + Stack = NewStack; + } + } + _SEH_HANDLE + { + /* No index */ + i = 0; + } + _SEH_END; + + /* Return frames parsed */ + return i; +} + /* RTL Atom Tables ************************************************************/ NTSTATUS Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Oct 1 21:58:49 2007 @@ -1543,8 +1543,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* remove this when all spi are implement */ - DPRINT1("UserSystemParametersInfo_StructGet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + DPRINT("UserSystemParametersInfo_StructGet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); _SEH_TRY {

1 0

[gedmurphy] 29331: - half implement support for multiple monitors to desk.cpl - people with more than one monitor can now use this applet in windows without it crashing
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Mon Oct 1 19:44:53 2007 New Revision: 29331 URL: http://svn.reactos.org/svn/reactos?rev=29331&view=rev Log: - half implement support for multiple monitors to desk.cpl - people with more than one monitor can now use this applet in windows without it crashing Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Oct 1 19:44:53 2007 @@ -330,10 +330,35 @@ 1, (LPARAM)&monitors); } - else - { - /* FIXME: multi video adapter */ - /* FIXME: choose selected adapter being the primary one */ + else /* FIXME: incomplete! */ + { + PMONSL_MONINFO pMonitors; + INT i; + + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + + pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); + if (pMonitors) + { + INT hack = 1280; + for (i = 0; i < Result; i++) + { + pMonitors[i].Position.x = hack * i; + pMonitors[i].Position.y = 0; + pMonitors[i].Size.cx = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsWidth; + pMonitors[i].Size.cy = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsHeight; + pMonitors[i].Flags = 0; + } + + SendDlgItemMessage(hwndDlg, + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + Result, + (LPARAM)pMonitors); + + HeapFree(GetProcessHeap(), 0, pMonitors); + } } pGlobalData->hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT);

1 0

[hpoussin] 29330: Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap Patch by Marc Piulachs, marc dot piulachs at codexchange dot net See issue #2706 for more details.
by hpoussin＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: hpoussin Date: Mon Oct 1 18:19:27 2007 New Revision: 29330 URL: http://svn.reactos.org/svn/reactos?rev=29330&view=rev Log: Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap Patch by Marc Piulachs, marc dot piulachs at codexchange dot net See issue #2706 for more details. Modified: trunk/reactos/base/services/services.rbuild trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/setup/welcome/welcome.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/setup/blue/blue.rbuild trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/disk/disk.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/media/drivers/etc/etc.rbuild trunk/reactos/media/fonts/fonts.rbuild trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/nls/nls.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/doc/rbuild.txt trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/project.dtd Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild (original) +++ trunk/reactos/base/services/services.rbuild Mon Oct 1 18:19:27 2007 @@ -1,22 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="audiosrv"> - <xi:include href="audiosrv/audiosrv.rbuild" /> -</directory> -<directory name="dhcp"> - <xi:include href="dhcp/dhcp.rbuild" /> -</directory> -<directory name="eventlog"> - <xi:include href="eventlog/eventlog.rbuild" /> -</directory> -<directory name="rpcss"> - <xi:include href="rpcss/rpcss.rbuild" /> -</directory> -<directory name="tcpsvcs"> - <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> -</directory> -<directory name="umpnpmgr"> - <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> -</directory> + <directory name="audiosrv"> + <xi:include href="audiosrv/audiosrv.rbuild" /> + </directory> + <directory name="dhcp"> + <xi:include href="dhcp/dhcp.rbuild" /> + </directory> + <directory name="eventlog"> + <xi:include href="eventlog/eventlog.rbuild" /> + </directory> + <directory name="rpcss"> + <xi:include href="rpcss/rpcss.rbuild" /> + </directory> + <directory name="tcpsvcs"> + <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> + </directory> + <directory name="umpnpmgr"> + <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> + </directory> </group> Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="reactos" type="win32gui"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="reactos">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false"> - <bootstrap base="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> <include base="inflib">.</include> Modified: trunk/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rbuild (original) +++ trunk/reactos/base/setup/welcome/welcome.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Mon Oct 1 18:19:27 2007 @@ -70,7 +70,7 @@ <file>i386-stub-win32.c</file> <file>explorer.rc</file> </module> -<installfile base=".">explorer-cfg-template.xml</installfile> +<installfile installbase=".">explorer-cfg-template.xml</installfile> <directory name="notifyhook"> <xi:include href="notifyhook/notifyhook.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Mon Oct 1 18:19:27 2007 @@ -4,12 +4,12 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> - <cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile base="$(CDOUTPUT)">unattend.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/boot… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild (original) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild Mon Oct 1 18:19:27 2007 @@ -2,27 +2,27 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="dosmbr" type="bootsector" > - <bootstrap base="loader" nameoncd="dosmbr.bin" /> + <bootstrap installbase="loader" nameoncd="dosmbr.bin" /> <file>dosmbr.asm</file> </module> <module name="ext2" type="bootsector"> - <bootstrap base="loader" nameoncd="ext2.bin" /> + <bootstrap installbase="loader" nameoncd="ext2.bin" /> <file>ext2.asm</file> </module> <module name="fat32" type="bootsector"> - <bootstrap base="loader" nameoncd="fat32.bin" /> + <bootstrap installbase="loader" nameoncd="fat32.bin" /> <file>fat32.asm</file> </module> <module name="fat" type="bootsector"> - <bootstrap base="loader" nameoncd="fat.bin" /> + <bootstrap installbase="loader" nameoncd="fat.bin" /> <file>fat.asm</file> </module> <module name="isoboot" type="bootsector"> - <bootstrap base="loader" nameoncd="isoboot.bin" /> + <bootstrap installbase="loader" nameoncd="isoboot.bin" /> <file>isoboot.asm</file> </module> <module name="isobtrt" type="bootsector"> - <bootstrap base="loader" nameoncd="isobtrt.bin" /> + <bootstrap installbase="loader" nameoncd="isobtrt.bin" /> <file>isobtrt.asm</file> </module> </group> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Mon Oct 1 18:19:27 2007 @@ -3,7 +3,7 @@ <group> <if property="ARCH" value="i386"> <module name="freeldr" type="bootloader"> - <bootstrap base="loader" /> + <bootstrap installbase="loader" /> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="setupldr" type="bootloader"> - <bootstrap base="loader" /> + <bootstrap installbase="loader" /> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> - <bootstrap base="$(CDOUTPUT)/system32" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> <include base="ReactOS">include/reactos/subsys</include> Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> <importlibrary definition="bootvid.def"></importlibrary> - <bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Mon Oct 1 18:19:27 2007 @@ -1,11 +1,11 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> - <importlibrary definition="kdcom.def"></importlibrary> - <bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" /> - <include base="kdcom">.</include> - <define name="__USE_W32API" /> - <library>ntoskrnl</library> - <library>hal</library> - <file>kdbg.c</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> + <importlibrary definition="kdcom.def"></importlibrary> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <include base="kdcom">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>kdbg.c</file> +</module> Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="cdfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="ntfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" /> Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="NDEBUG" /> <library>pseh</library> Modified: trunk/reactos/drivers/setup/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rb… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.rbuild (original) +++ trunk/reactos/drivers/setup/blue/blue.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rbuild (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rbuild (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="_DEBUG" /> <include base="uniata">.</include> Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild (original) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="buslogic">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… ============================================================================== --- trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="diskdump.def" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Mon Oct 1 18:19:27 2007 @@ -1,13 +1,13 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap base="$(CDOUTPUT)" /> - <define name="__USE_W32API" /> - <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport.def" /> - <include base="scsiport">.</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>scsiport.c</file> - <file>scsiport.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> + <define name="_SCSIPORT_" /> + <importlibrary definition="scsiport.def" /> + <include base="scsiport">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>scsiport.c</file> + <file>scsiport.rc</file> +</module> Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halppc/up/halup.rbuild (original) +++ trunk/reactos/hal/halppc/up/halup.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halppc_up" type="kernelmodedll"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halmp" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halup" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbui… ============================================================================== --- trunk/reactos/media/drivers/etc/etc.rbuild (original) +++ trunk/reactos/media/drivers/etc/etc.rbuild Mon Oct 1 18:19:27 2007 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <cdfile base="$(CDOUTPUT)">services</cdfile> - <installfile base="system32/drivers/etc">services</installfile> + <cdfile installbase="$(CDOUTPUT)">services</cdfile> + <installfile installbase="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> - <cdfile base="$(CDOUTPUT)">KDBinit</cdfile> - <installfile base="system32/drivers/etc">KDBinit</installfile> + <cdfile installbase="$(CDOUTPUT)">KDBinit</cdfile> + <installfile installbase="system32/drivers/etc">KDBinit</installfile> </if> </group> Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r… ============================================================================== --- trunk/reactos/media/fonts/fonts.rbuild (original) +++ trunk/reactos/media/fonts/fonts.rbuild Mon Oct 1 18:19:27 2007 @@ -1,55 +1,55 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<installfile base="media/fonts">DejaVuSans-Bold.ttf </installfile> -<installfile base="media/fonts">DejaVuSans.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-Italic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> -<installfile base="media/fonts">c0419bt_.ttf</installfile> -<installfile base="media/fonts">c0582bt_.ttf</installfile> -<installfile base="media/fonts">c0583bt_.ttf</installfile> -<installfile base="media/fonts">c0611bt_.ttf</installfile> -<installfile base="media/fonts">c0632bt_.ttf</installfile> -<installfile base="media/fonts">c0633bt_.ttf</installfile> -<installfile base="media/fonts">c0648bt_.ttf</installfile> -<installfile base="media/fonts">c0649bt_.ttf</installfile> -<installfile base="media/fonts">cour.ttf</installfile> -<installfile base="media/fonts">courb.ttf</installfile> -<installfile base="media/fonts">courbi.ttf</installfile> -<installfile base="media/fonts">helb____.ttf</installfile> -<installfile base="media/fonts">Marlett.ttf</installfile> -<installfile base="media/fonts">timr____.ttf</installfile> -<installfile base="media/fonts">UTB_____.ttf</installfile> -<installfile base="media/fonts">UTBI____.ttf</installfile> -<installfile base="media/fonts">UTI_____.ttf</installfile> -<installfile base="media/fonts">UTRG____.ttf</installfile> -<installfile base="media/fonts">Vera.ttf</installfile> -<installfile base="media/fonts">VeraBd.ttf</installfile> -<installfile base="media/fonts">VeraBI.ttf</installfile> -<installfile base="media/fonts">VeraIt.ttf</installfile> -<installfile base="media/fonts">VeraMoBd.ttf</installfile> -<installfile base="media/fonts">VeraMoBI.ttf</installfile> -<installfile base="media/fonts">VeraMoIt.ttf</installfile> -<installfile base="media/fonts">VeraMono.ttf</installfile> -<installfile base="media/fonts">VeraSe.ttf</installfile> -<installfile base="media/fonts">VeraSeBd.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile> + <installfile installbase="media/fonts">DejaVuSans.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> + <installfile installbase="media/fonts">c0419bt_.ttf</installfile> + <installfile installbase="media/fonts">c0582bt_.ttf</installfile> + <installfile installbase="media/fonts">c0583bt_.ttf</installfile> + <installfile installbase="media/fonts">c0611bt_.ttf</installfile> + <installfile installbase="media/fonts">c0632bt_.ttf</installfile> + <installfile installbase="media/fonts">c0633bt_.ttf</installfile> + <installfile installbase="media/fonts">c0648bt_.ttf</installfile> + <installfile installbase="media/fonts">c0649bt_.ttf</installfile> + <installfile installbase="media/fonts">cour.ttf</installfile> + <installfile installbase="media/fonts">courb.ttf</installfile> + <installfile installbase="media/fonts">courbi.ttf</installfile> + <installfile installbase="media/fonts">helb____.ttf</installfile> + <installfile installbase="media/fonts">Marlett.ttf</installfile> + <installfile installbase="media/fonts">timr____.ttf</installfile> + <installfile installbase="media/fonts">UTB_____.ttf</installfile> + <installfile installbase="media/fonts">UTBI____.ttf</installfile> + <installfile installbase="media/fonts">UTI_____.ttf</installfile> + <installfile installbase="media/fonts">UTRG____.ttf</installfile> + <installfile installbase="media/fonts">Vera.ttf</installfile> + <installfile installbase="media/fonts">VeraBd.ttf</installfile> + <installfile installbase="media/fonts">VeraBI.ttf</installfile> + <installfile installbase="media/fonts">VeraIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> + <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMono.ttf</installfile> + <installfile installbase="media/fonts">VeraSe.ttf</installfile> + <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> </group> Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Mon Oct 1 18:19:27 2007 @@ -1,23 +1,23 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile base="inf">acpi.inf</installfile> - <installfile base="inf">cdrom.inf</installfile> - <installfile base="inf">display.inf</installfile> - <installfile base="inf">hdc.inf</installfile> - <installfile base="inf">keyboard.inf</installfile> - <installfile base="inf">layout.inf</installfile> - <installfile base="inf">machine.inf</installfile> - <installfile base="inf">msmouse.inf</installfile> - <installfile base="inf">NET_NIC.inf</installfile> - <installfile base="inf">netamd.inf</installfile> - <installfile base="inf">netisa.inf</installfile> - <installfile base="inf">netrtpnt.inf</installfile> - <installfile base="inf">nettcpip.inf</installfile> - <installfile base="inf">ports.inf</installfile> - <installfile base="inf">scsi.inf</installfile> - <installfile base="inf" root="output">syssetup.inf</installfile> - <installfile base="inf">usbport.inf</installfile> - <installfile base="inf">usbstor.inf</installfile> - <installfile base="inf">xboxdisp.inf</installfile> + <installfile installbase="inf">acpi.inf</installfile> + <installfile installbase="inf">cdrom.inf</installfile> + <installfile installbase="inf">display.inf</installfile> + <installfile installbase="inf">hdc.inf</installfile> + <installfile installbase="inf">keyboard.inf</installfile> + <installfile installbase="inf">layout.inf</installfile> + <installfile installbase="inf">machine.inf</installfile> + <installfile installbase="inf">msmouse.inf</installfile> + <installfile installbase="inf">NET_NIC.inf</installfile> + <installfile installbase="inf">netamd.inf</installfile> + <installfile installbase="inf">netisa.inf</installfile> + <installfile installbase="inf">netrtpnt.inf</installfile> + <installfile installbase="inf">nettcpip.inf</installfile> + <installfile installbase="inf">ports.inf</installfile> + <installfile installbase="inf">scsi.inf</installfile> + <installfile installbase="inf" root="output">syssetup.inf</installfile> + <installfile installbase="inf">usbport.inf</installfile> + <installfile installbase="inf">usbstor.inf</installfile> + <installfile installbase="inf">xboxdisp.inf</installfile> </group> Modified: trunk/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/nls/nls.rbuild (original) +++ trunk/reactos/media/nls/nls.rbuild Mon Oct 1 18:19:27 2007 @@ -1,62 +1,62 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile> -<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile> -<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile> -<installfile base="system32">c_037.nls</installfile> -<installfile base="system32">c_424.nls</installfile> -<installfile base="system32">c_437.nls</installfile> -<installfile base="system32">c_500.nls</installfile> -<installfile base="system32">c_737.nls</installfile> -<installfile base="system32">c_775.nls</installfile> -<installfile base="system32">c_850.nls</installfile> -<installfile base="system32">c_852.nls</installfile> -<installfile base="system32">c_855.nls</installfile> -<installfile base="system32">c_856.nls</installfile> -<installfile base="system32">c_857.nls</installfile> -<installfile base="system32">c_860.nls</installfile> -<installfile base="system32">c_861.nls</installfile> -<installfile base="system32">c_862.nls</installfile> -<installfile base="system32">c_863.nls</installfile> -<installfile base="system32">c_864.nls</installfile> -<installfile base="system32">c_865.nls</installfile> -<installfile base="system32">c_866.nls</installfile> -<installfile base="system32">c_869.nls</installfile> -<installfile base="system32">c_874.nls</installfile> -<installfile base="system32">c_875.nls</installfile> -<installfile base="system32">c_878.nls</installfile> -<installfile base="system32">c_932.nls</installfile> -<installfile base="system32">c_936.nls</installfile> -<installfile base="system32">c_949.nls</installfile> -<installfile base="system32">c_950.nls</installfile> -<installfile base="system32">c_1006.nls</installfile> -<installfile base="system32">c_1026.nls</installfile> -<installfile base="system32">c_1250.nls</installfile> -<installfile base="system32">c_1251.nls</installfile> -<installfile base="system32">c_1252.nls</installfile> -<installfile base="system32">c_1253.nls</installfile> -<installfile base="system32">c_1254.nls</installfile> -<installfile base="system32">c_1255.nls</installfile> -<installfile base="system32">c_1256.nls</installfile> -<installfile base="system32">c_1257.nls</installfile> -<installfile base="system32">c_1258.nls</installfile> -<installfile base="system32">c_10000.nls</installfile> -<installfile base="system32">c_10006.nls</installfile> -<installfile base="system32">c_10007.nls</installfile> -<installfile base="system32">c_10029.nls</installfile> -<installfile base="system32">c_10079.nls</installfile> -<installfile base="system32">c_10081.nls</installfile> -<installfile base="system32">c_20866.nls</installfile> -<installfile base="system32">c_28591.nls</installfile> -<installfile base="system32">c_28592.nls</installfile> -<installfile base="system32">c_28593.nls</installfile> -<installfile base="system32">c_28594.nls</installfile> -<installfile base="system32">c_28595.nls</installfile> -<installfile base="system32">c_28596.nls</installfile> -<installfile base="system32">c_28597.nls</installfile> -<installfile base="system32">c_28598.nls</installfile> -<installfile base="system32">c_28599.nls</installfile> -<installfile base="system32">l_intl.nls</installfile> + <installfile installbase="system32">c_037.nls</installfile> + <installfile installbase="system32">c_424.nls</installfile> + <installfile installbase="system32">c_437.nls</installfile> + <installfile installbase="system32">c_500.nls</installfile> + <installfile installbase="system32">c_737.nls</installfile> + <installfile installbase="system32">c_775.nls</installfile> + <installfile installbase="system32">c_850.nls</installfile> + <installfile installbase="system32">c_852.nls</installfile> + <installfile installbase="system32">c_855.nls</installfile> + <installfile installbase="system32">c_856.nls</installfile> + <installfile installbase="system32">c_857.nls</installfile> + <installfile installbase="system32">c_860.nls</installfile> + <installfile installbase="system32">c_861.nls</installfile> + <installfile installbase="system32">c_862.nls</installfile> + <installfile installbase="system32">c_863.nls</installfile> + <installfile installbase="system32">c_864.nls</installfile> + <installfile installbase="system32">c_865.nls</installfile> + <installfile installbase="system32">c_866.nls</installfile> + <installfile installbase="system32">c_869.nls</installfile> + <installfile installbase="system32">c_874.nls</installfile> + <installfile installbase="system32">c_875.nls</installfile> + <installfile installbase="system32">c_878.nls</installfile> + <installfile installbase="system32">c_932.nls</installfile> + <installfile installbase="system32">c_936.nls</installfile> + <installfile installbase="system32">c_949.nls</installfile> + <installfile installbase="system32">c_950.nls</installfile> + <installfile installbase="system32">c_1006.nls</installfile> + <installfile installbase="system32">c_1026.nls</installfile> + <installfile installbase="system32">c_1250.nls</installfile> + <installfile installbase="system32">c_1251.nls</installfile> + <installfile installbase="system32">c_1252.nls</installfile> + <installfile installbase="system32">c_1253.nls</installfile> + <installfile installbase="system32">c_1254.nls</installfile> + <installfile installbase="system32">c_1255.nls</installfile> + <installfile installbase="system32">c_1256.nls</installfile> + <installfile installbase="system32">c_1257.nls</installfile> + <installfile installbase="system32">c_1258.nls</installfile> + <installfile installbase="system32">c_10000.nls</installfile> + <installfile installbase="system32">c_10006.nls</installfile> + <installfile installbase="system32">c_10007.nls</installfile> + <installfile installbase="system32">c_10029.nls</installfile> + <installfile installbase="system32">c_10079.nls</installfile> + <installfile installbase="system32">c_10081.nls</installfile> + <installfile installbase="system32">c_20866.nls</installfile> + <installfile installbase="system32">c_28591.nls</installfile> + <installfile installbase="system32">c_28592.nls</installfile> + <installfile installbase="system32">c_28593.nls</installfile> + <installfile installbase="system32">c_28594.nls</installfile> + <installfile installbase="system32">c_28595.nls</installfile> + <installfile installbase="system32">c_28596.nls</installfile> + <installfile installbase="system32">c_28597.nls</installfile> + <installfile installbase="system32">c_28598.nls</installfile> + <installfile installbase="system32">c_28599.nls</installfile> + <installfile installbase="system32">l_intl.nls</installfile> </group> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl.def" /> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Oct 1 18:19:27 2007 @@ -97,7 +97,7 @@ "<bootstrap> is not applicable for this module type." ); } - const XMLAttribute* att = node.GetAttribute ( "base", false ); + const XMLAttribute* att = node.GetAttribute ( "installbase", false ); if ( att != NULL ) base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Mon Oct 1 18:19:27 2007 @@ -39,7 +39,7 @@ const string& path ) : XmlNode ( project, cdfileNode ) { - const XMLAttribute* att = cdfileNode.GetAttribute ( "base", false ); + const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false ); string target_relative_directory; if ( att != NULL ) target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/doc/rbuild.tx… ============================================================================== --- trunk/reactos/tools/rbuild/doc/rbuild.txt (original) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt Mon Oct 1 18:19:27 2007 @@ -177,10 +177,10 @@ A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file. Syntax: - <bootstrap base="reactos" nameoncd="halmp.dll" /> - -Attributes: - base - Put file in this directory on the bootable CD. This attribute is optional. + <bootstrap installbase="reactos" nameoncd="halmp.dll" /> + +Attributes: + installbase - Put file in this directory on the bootable CD. This attribute is optional. nameoncd - Name of file on the bootable CD. This attribute is optional. Value: @@ -195,10 +195,10 @@ A cdfile element specifies the name of a file that is to be put on the bootable CD. Syntax: - <cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile> - -Attributes: - base - Put file in this directory on the bootable CD. This attribute is optional. + <cdfile installbase="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile> + +Attributes: + installbase - Put file in this directory on the bootable CD. This attribute is optional. nameoncd - Name of file on the bootable CD. This attribute is optional. Value: @@ -392,10 +392,10 @@ An installfile element specifies the name of a file that is to be installed when using 'make install'. Syntax: - <installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile> - -Attributes: - base - Put file in this directory within the install directory. This attribute is optional. + <installfile installbase="reactos" newname="ReadMe.txt">ReadMe.txt</installfile> + +Attributes: + installbase - Put file in this directory within the install directory. This attribute is optional. newname - Name of file within the install directory. This attribute is optional. Value: Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Mon Oct 1 18:19:27 2007 @@ -27,7 +27,7 @@ const string& path ) : XmlNode(project, installfileNode ) { - const XMLAttribute* base = node.GetAttribute ( "base", false ); + const XMLAttribute* base = node.GetAttribute ( "installbase", false ); const XMLAttribute* newname = node.GetAttribute ( "newname", false ); DirectoryLocation source_directory = SourceDirectory; Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Mon Oct 1 18:19:27 2007 @@ -22,14 +22,14 @@ <!ELEMENT bootstrap EMPTY> <!ATTLIST bootstrap - base %Text; #IMPLIED - nameoncd %Text; #IMPLIED + installbase %Text; #IMPLIED + nameoncd %Text; #IMPLIED > <!ELEMENT cdfile (#PCDATA)> <!ATTLIST cdfile - base %Text; #IMPLIED - nameoncd %Text; #IMPLIED + installbase %Text; #IMPLIED + nameoncd %Text; #IMPLIED > <!ELEMENT compilerflag (#PCDATA)> @@ -55,8 +55,8 @@ <!ELEMENT installfile (#PCDATA)> <!ATTLIST installfile - base %Text; #IMPLIED - root (intermediate|output) #IMPLIED + installbase %Text; #IMPLIED + root (intermediate|output) #IMPLIED > <!ELEMENT group (cdfile*|define*|directory*|file*|if*|ifnot*|include*|installfile*|property*|module*|group*|xi:include*)+>

1 0

[gedmurphy] 29329: use w3seek's control for single monitors displays
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Mon Oct 1 17:54:54 2007 New Revision: 29329 URL: http://svn.reactos.org/svn/reactos?rev=29329&view=rev Log: use w3seek's control for single monitors displays Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Oct 1 17:54:54 2007 @@ -314,9 +314,21 @@ } else if (Result == 1) { + MONSL_MONINFO monitors; + /* Single video adapter */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + + monitors.Position.x = monitors.Position.y = 0; + monitors.Size.cx = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + monitors.Size.cy = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + monitors.Flags = 0; + SendDlgItemMessage(hwndDlg, + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + 1, + (LPARAM)&monitors); } else {

1 0

[gedmurphy] 29328: It's not pretty, but get desk.cpl building in msvc again.
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Mon Oct 1 17:23:28 2007 New Revision: 29328 URL: http://svn.reactos.org/svn/reactos?rev=29328&view=rev Log: It's not pretty, but get desk.cpl building in msvc again. Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/devsett.c Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Mon Oct 1 17:23:28 2007 @@ -99,6 +99,9 @@ LocalFree((HLOCAL)lpDisplayName); } + +typedef HPSXA (WINAPI * CPSEAE)(HKEY,LPCWSTR,UINT,IDataObject*); + BOOL DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice) { @@ -108,6 +111,11 @@ HPSXA hpsxaDev, hpsxaDisp; BOOL Ret; IDataObject *pdo; + HMODULE hShell32 = NULL; + CPSEAE msvc_SHCreatePropSheetExtArrayEx; + + /* silence gcc warning */ + msvc_SHCreatePropSheetExtArrayEx = NULL; /* FIXME: Build the "%s and %s" caption string for the monitor and adapter name */ szCaption[0] = _T('\0'); @@ -127,11 +135,23 @@ if (pdo != NULL) BuildAdvPropTitle(pdo, szCaption, sizeof(szCaption) / sizeof(szCaption[0])); +#ifdef _MSC_VER + hShell32 = LoadLibrary(_T("shell32.dll")); + if(hShell32 == NULL) + return FALSE; + msvc_SHCreatePropSheetExtArrayEx = (CPSEAE)GetProcAddress(hShell32, (LPCSTR)194); + hpsxaDev = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); +#else hpsxaDev = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); +#endif if (hpsxaDev != NULL) SHAddFromPropSheetExtArray(hpsxaDev, PropSheetAddPage, (LPARAM)&psh); +#ifdef _MSC_VER + hpsxaDisp = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); +#else hpsxaDisp = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo); +#endif if (hpsxaDisp != NULL) SHAddFromPropSheetExtArray(hpsxaDisp, PropSheetAddPage, (LPARAM)&psh); @@ -145,5 +165,8 @@ IDataObject_Release(pdo); + if (hShell32) + FreeLibrary(hShell32); + return Ret; } Modified: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c (original) +++ trunk/reactos/dll/cpl/desk/devsett.c Mon Oct 1 17:23:28 2007 @@ -228,7 +228,7 @@ if (lpRegKey != NULL) { if (wcslen(lpRegKey) >= wcslen(szRegPrefix) && - !wcsnicmp(lpRegKey, + !_wcsnicmp(lpRegKey, szRegPrefix, wcslen(szRegPrefix))) {

1 0

[gedmurphy] 29327: remove some debug output I missed
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Mon Oct 1 15:59:11 2007 New Revision: 29327 URL: http://svn.reactos.org/svn/reactos?rev=29327&view=rev Log: remove some debug output I missed Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Mon Oct 1 15:59:11 2007 @@ -1372,18 +1372,14 @@ // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; - //DPRINT1("%d bits\n", bits); - // Determine paletteType from Bits Per Pixel if (bits <= 8) { - //DPRINT1("8\n"); *paletteType = PAL_INDEXED; RedMask = GreenMask = BlueMask = 0; } else if(bits < 24) { - //DPRINT1("24\n"); *paletteType = PAL_BITFIELDS; RedMask = 0xf800; GreenMask = 0x07e0; @@ -1391,7 +1387,6 @@ } else { - //DPRINT1("else\n"); *paletteType = PAL_BGR; RedMask = 0xff0000; GreenMask = 0x00ff00; @@ -1409,17 +1404,14 @@ if (PAL_INDEXED == *paletteType) { - //DPRINT1("in\n"); hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)bmi->bmiColors); } else { - //DPRINT1("out\n"); hPal = PALETTE_AllocPalette(*paletteType, ColorCount, (ULONG*) palEntries, RedMask, GreenMask, BlueMask ); } - //DPRINT1("returning %p\n", hPal); return hPal; }

1 0

[gedmurphy] 29326: - partial rewrite of NtGdiGetDIBitsInternal - wrap all usermode read/writes in seh - make it more compatible with XP. We now pass all current GetDIBits tests and win32k tests
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Mon Oct 1 15:53:31 2007 New Revision: 29326 URL: http://svn.reactos.org/svn/reactos?rev=29326&view=rev Log: - partial rewrite of NtGdiGetDIBitsInternal - wrap all usermode read/writes in seh - make it more compatible with XP. We now pass all current GetDIBits tests and win32k tests Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Mon Oct 1 15:53:31 2007 @@ -435,6 +435,7 @@ return ret; } + /* Converts a device-dependent bitmap to a DIB */ INT STDCALL NtGdiGetDIBitsInternal(HDC hDC, @@ -447,156 +448,134 @@ UINT MaxBits, UINT MaxInfo) { - BITMAPOBJ *BitmapObj; - SURFOBJ *DestSurfObj; - XLATEOBJ *XlateObj; - HBITMAP DestBitmap; - SIZEL DestSize; - HPALETTE hSourcePalette; - HPALETTE hDestPalette; - PPALGDI SourcePalette; - PPALGDI DestPalette; - ULONG SourcePaletteType; - ULONG DestPaletteType; PDC Dc; - POINTL SourcePoint; - RECTL DestRect; + BITMAPOBJ *BitmapObj = NULL; + HBITMAP hDestBitmap = NULL; + HPALETTE hSourcePalette = NULL; + HPALETTE hDestPalette = NULL; + PPALGDI SourcePalette = NULL; + PPALGDI DestPalette = NULL; + NTSTATUS Status = STATUS_SUCCESS; ULONG Result = 0; - ULONG Index; + BOOL bPaletteMatch = FALSE; + + DPRINT("Entered NtGdiGetDIBitsInternal()\n"); /* Get handle for the palette in DC. */ Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (Dc == NULL) return 0; if (Dc->IsIC) { DC_UnlockDc(Dc); return 0; } - + /* Source palette obtained from the windows hdc */ hSourcePalette = Dc->w.hPalette; - hDestPalette = Dc->w.hPalette; // unsure of this (Ged) DC_UnlockDc(Dc); - /* Get pointer to the source bitmap object. */ + /* don't do anything if we fail this */ + if (Usage != DIB_RGB_COLORS && Usage != DIB_PAL_COLORS) + return 0; + + /* Get a pointer to the source bitmap object */ BitmapObj = BITMAPOBJ_LockBitmap(hBitmap); if (BitmapObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; - } - + + /* fill out the BITMAPINFO struct */ if (Bits == NULL) { - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + _SEH_TRY { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; - coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; - - if (BitmapObj->SurfObj.lDelta > 0) - coreheader->bcHeight = -coreheader->bcHeight; - + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + ProbeForWrite(Info, sizeof(BITMAPINFO), 1); + + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; + coreheader->bcPlanes = 1; + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + + if (BitmapObj->SurfObj.lDelta > 0) + coreheader->bcHeight = -coreheader->bcHeight; + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + ProbeForWrite(Info, sizeof(BITMAPINFO), 1); + + Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; + Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Report negtive height for top-down bitmaps. */ + if (BitmapObj->SurfObj.lDelta > 0) + Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + switch (BitmapObj->SurfObj.iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + Info->bmiHeader.biCompression = BI_RGB; + break; + case BMF_4RLE: + Info->bmiHeader.biCompression = BI_RLE4; + break; + case BMF_8RLE: + Info->bmiHeader.biCompression = BI_RLE8; + break; + case BMF_JPEG: + Info->bmiHeader.biCompression = BI_JPEG; + break; + case BMF_PNG: + Info->bmiHeader.biCompression = BI_PNG; + break; + } + + Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; + Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ + } + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) + { Result = BitmapObj->SurfObj.sizlBitmap.cy; } - - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + } + else + { + SIZEL DestSize; + ULONG SourcePaletteType = 0; + ULONG DestPaletteType; + POINTL SourcePoint; + ULONG Index; + + _SEH_TRY { - Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; - /* Report negtive height for top-down bitmaps. */ - if (BitmapObj->SurfObj.lDelta > 0) - Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; - Info->bmiHeader.biPlanes = 1; - Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + ProbeForRead(Info, sizeof(BITMAPINFO), 1); + + if (Info->bmiHeader.biBitCount == BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat)) { - switch (BitmapObj->SurfObj.iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_8BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - Info->bmiHeader.biCompression = BI_RGB; - break; - case BMF_4RLE: - Info->bmiHeader.biCompression = BI_RLE4; - break; - case BMF_8RLE: - Info->bmiHeader.biCompression = BI_RLE8; - break; - case BMF_JPEG: - Info->bmiHeader.biCompression = BI_JPEG; - break; - case BMF_PNG: - Info->bmiHeader.biCompression = BI_PNG; - break; - } - - Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; - Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biClrUsed = 0; - Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - Result = BitmapObj->SurfObj.sizlBitmap.cy; + hDestPalette = hSourcePalette; + bPaletteMatch = TRUE; } - } - } - else - { - if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) - { - Result = 0; - } - else - { - ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; - DestSize.cy = ScanLines; - - DestBitmap = NULL; - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - - DestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), - BitmapFormat(coreheader->bcBitCount, BI_RGB), - 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - INT one, two, three; - - one = DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), - two = ((DestSize.cx * Info->bmiHeader.biBitCount + 31) & ~31) >> 3; - three = DestSize.cx * (Info->bmiHeader.biBitCount >> 3); - - DestBitmap = EngCreateBitmap(DestSize, - /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ - DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if(DestBitmap == NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return 0; - } - - DestSurfObj = EngLockSurface((HSURF)DestBitmap); + else + hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; SourcePalette = PALETTE_LockPalette(hSourcePalette); /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ @@ -604,10 +583,18 @@ SourcePaletteType = SourcePalette->Mode; PALETTE_UnlockPalette(SourcePalette); - DestPalette = PALETTE_LockPalette(hDestPalette); - /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - //ASSERT(DestPalette); - DestPaletteType = DestPalette->Mode; + if (bPaletteMatch) + { + DestPalette = PALETTE_LockPalette(hDestPalette); + /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ + DPRINT1("DestPalette : %p\n", DestPalette); + ASSERT(DestPalette); + DestPaletteType = DestPalette->Mode; + } + else + { + DestPalette = SourcePalette; + } /* Copy palette. */ /* FIXME: This is largely incomplete. */ @@ -631,9 +618,65 @@ } } - PALETTE_UnlockPalette(DestPalette); - - XlateObj = IntEngCreateXlate(DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette); + if (bPaletteMatch) + PALETTE_UnlockPalette(DestPalette); + + /* Create the destination bitmap to for the copy operation */ + if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) + { + _SEH_YIELD(goto cleanup); + } + else + { + ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); + DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; + DestSize.cy = ScanLines; + + hDestBitmap = NULL; + + ProbeForWrite(Bits, sizeof(BitmapObj->SurfObj.cjBits), 1); + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + + hDestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), + BitmapFormat(coreheader->bcBitCount, BI_RGB), + 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + hDestBitmap = EngCreateBitmap(DestSize, + /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ + DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (hDestBitmap == NULL) + _SEH_YIELD(goto cleanup); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) + { + XLATEOBJ *XlateObj; + SURFOBJ *DestSurfObj; + RECTL DestRect; + + XlateObj = IntEngCreateXlate(DestPaletteType, + SourcePaletteType, + hDestPalette, + hSourcePalette); SourcePoint.x = 0; SourcePoint.y = BitmapObj->SurfObj.sizlBitmap.cy - (StartScan + ScanLines); @@ -643,6 +686,8 @@ DestRect.left = 0; DestRect.right = DestSize.cx; DestRect.bottom = DestSize.cy; + + DestSurfObj = EngLockSurface((HSURF)hDestBitmap); if (EngCopyBits(DestSurfObj, &BitmapObj->SurfObj, @@ -659,7 +704,16 @@ } } +cleanup: + if (hDestBitmap != NULL) + EngDeleteSurface((HSURF)hDestBitmap); + + if (hDestPalette != NULL && bPaletteMatch == FALSE) + PALETTE_FreePalette(hDestPalette); + BITMAPOBJ_UnlockBitmap(BitmapObj); + + DPRINT("leaving NtGdiGetDIBitsInternal\n"); return Result; } @@ -1318,14 +1372,18 @@ // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; + //DPRINT1("%d bits\n", bits); + // Determine paletteType from Bits Per Pixel if (bits <= 8) { + //DPRINT1("8\n"); *paletteType = PAL_INDEXED; RedMask = GreenMask = BlueMask = 0; } else if(bits < 24) { + //DPRINT1("24\n"); *paletteType = PAL_BITFIELDS; RedMask = 0xf800; GreenMask = 0x07e0; @@ -1333,6 +1391,7 @@ } else { + //DPRINT1("else\n"); *paletteType = PAL_BGR; RedMask = 0xff0000; GreenMask = 0x00ff00; @@ -1350,14 +1409,17 @@ if (PAL_INDEXED == *paletteType) { + //DPRINT1("in\n"); hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)bmi->bmiColors); } else { + //DPRINT1("out\n"); hPal = PALETTE_AllocPalette(*paletteType, ColorCount, (ULONG*) palEntries, RedMask, GreenMask, BlueMask ); } + //DPRINT1("returning %p\n", hPal); return hPal; } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Mon Oct 1 15:53:31 2007 @@ -1031,7 +1031,8 @@ GdiHdr->lockline = 0; } #else - InterlockedDecrement((PLONG)&GdiHdr->Locks); + if (InterlockedDecrement((PLONG)&GdiHdr->Locks) < 0) + DPRINT1("Trying to unlock non-existant object\n"); #endif }

1 0

[fireball] 29325: - Make VideoPortCreateSecondaryDisplay() return an error instead of success, so that driver does not assume the SecondaryDeviceExtension was created for it. - Add one more DPRINT() to show the size of Device Extension miniport has asked for. See issue #2672 for more details.
by fireball＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: fireball Date: Mon Oct 1 14:18:53 2007 New Revision: 29325 URL: http://svn.reactos.org/svn/reactos?rev=29325&view=rev Log: - Make VideoPortCreateSecondaryDisplay() return an error instead of success, so that driver does not assume the SecondaryDeviceExtension was created for it. - Add one more DPRINT() to show the size of Device Extension miniport has asked for. See issue #2672 for more details. Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Mon Oct 1 14:18:53 2007 @@ -202,6 +202,9 @@ /* Create a unicode device name. */ swprintf(DeviceBuffer, L"\\Device\\Video%lu", DeviceNumber); RtlInitUnicodeString(&DeviceName, DeviceBuffer); + + DPRINT("HwDeviceExtension size is: 0x%x\n", + DriverExtension->InitializationData.HwDeviceExtensionSize); /* Create the device object. */ Status = IoCreateDevice( @@ -1165,7 +1168,7 @@ IN ULONG Flag) { DPRINT1("VideoPortCreateSecondaryDisplay: Unimplemented.\n"); - return NO_ERROR; + return ERROR_DEV_NOT_EXIST; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs