- Ros-dev - ReactOS.org

CMake adoption
by caemyr＠myopera.com 09 Oct '11

09 Oct '11

You might know me as a stout supporter of CMake transition, but a single experience shattered my certainity. Today i tried to resolve a backtrace for a bug report, done with a cmake iso. The results were horrendous. The backtrace was lenghty, but on rbuild such task would take around 15 mintues for me, having all files extracted and prepped log.. At the present moment, cmake bt resolving is a total mess and practically prevents anyone doing such log. I might not be a programmer, but was somewhat skilled in my testers duties, also as some recall, i loved doing manual traces by raddr2line. With cmake - i hate it: 1. the whole process takes minutes more per frame: you need the base address, add the offset and type in the addr2line command 2. base address from kdbg: mod is not reliable, as modules might be relocated. addr2line doesn't know about that... 3. C++ function names are not demangled. For those modules that are written in c++ you will only get source lines, unless you check them up manually. 4. Being somewhat experienced, i see no way how i`m to explain newcomer how to do a backtrace... on the other hand, do you expect anyone to waste half an hour doing so? This HAS to be resolved before rbuild is put to retirement. Amine was talking about getting back to rsym - sure, why not? Anything that works will be better than current situation. -- With best regards Caemyr

5 6

Re: [ros-dev] [ros-diffs] [jimtabor] 54044: [Win32k] - Implement get atom name for user32.
by Timo Kreuzer 07 Oct '11

07 Oct '11

Am 07.10.2011 15:56, schrieb jimtabor(a)svn.reactos.org: > > +DWORD > +APIENTRY > +NtUserGetAtomName( > + ATOM nAtom, > + PUNICODE_STRING pBuffer) > +{ > + DWORD Ret; > + UNICODE_STRING CapturedName = {0}; > + UserEnterShared(); > + _SEH2_TRY > + { > + CapturedName = ProbeForReadUnicodeString(pBuffer); > + Ret = IntGetAtomName((RTL_ATOM)nAtom, CapturedName.Buffer, (ULONG)CapturedName.Length); > + } > + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > + { > + Ret = 0; > + } > + _SEH2_END > + UserLeave(); > + return Ret; > +} IntGetAtomName must not be called from inside SEH, if it throws you'll be left with a locked atom table. Timo

1 0

Re: [ros-dev] [ros-diffs] [cgutman] 54016: [HAL] - Implement support for scatter/gather DMA - Tested with Intel's NDIS 5.1 PRO/1000 driver (but more testing would be helpful to weed out bugs) [NDIS] - Report NDIS 5.1 now si...
by Colin Finck 06 Oct '11

06 Oct '11

cgutman(a)svn.reactos.org wrote: > - Implement support for scatter/gather DMA This commit deserves a huge LIKE button, thanks! Will try it out as soon as I have access to my ReactOS laptop again. Finally a chance for getting its Ethernet port to work :-) - Colin

5 4

[ros-diffs] [gadamopoulos] 53751: [comctl32]
by James Tabor 06 Oct '11

06 Oct '11

Hi!! This is wrong, 8^( + class.style |= CS_GLOBALCLASS; + class.hInstance = COMCTL32_hModule; The point in THEMING_Initialize was to get the current global classes and make locals for each process. So that process could have it. Not the whole system! Note from a msdn blog, "If you pass the CS_GLOBALCLASS flag when registering the class, then the window manager will ignore the instance handle when looking for your class. All of the USER32 classes are registered as global." I spent a week now looking through it all, ReactOS is handling the class registration correctly. My best guess, if themes is active do as the original code had it before and use IsThemeActive like it is setup. Keep class.hInstance = COMCTL32_hModule; and don't use CS_GLOBALCLAS so you can find it again. Thanks, James

2 2

Proposal for deletion
by Pierre Schweitzer 05 Oct '11

05 Oct '11

Hi, today, after looking at the daily source analysis we have, I found out that all that stuff could be improved by lightening trunk. We have huge amount of unused code (even not linked in CMake) rotting in trunk. I'm mainly talking about icu4ros. AFAIK it was an attempt from KJK for I even don't recall what. Here is my proposal: we do a branch for this. And then, we remove it from trunk. This will make things lighter, without loosing code. Any objections/comments? Regards, Pierre

3 3

Re: [ros-dev] [ros-bugs] [Bug 6535] Sync gdi32+kernel32 winetests to git head
by caemyr＠myopera.com 05 Oct '11

05 Oct '11

With this attempt Thomas proved that it is possible to use patchbot for both trunk and rostests patching. Ask him how he did it:> On Wednesday, October 05, 2011 9:05 AM, ReactOS.Bugzilla(a)reactos.org wrote: > --- Comment #1 from ThFabba <thfabba(a)gmx.de> 2011-10-05 09:05:44 CET --- > Created an attachment (id=6782) > --> (http://www.reactos.org/bugzilla/attachment.cgi?id=6782) > patch 2 > > Maybe this works :p > -- With best regards Caemyr

1 0

Setupapi & VBox additions
by Thomas Faber 04 Oct '11

04 Oct '11

Hi, I've been looking at VirtualBox 4.1.x guest additions, which don't install in ROS [1] and came up with a patch [2] that seems to fix them. While patchbot says this is okay [3] (and the last hunk even fixes a few setupapi tests), I am very unsure about the SP_COPY_NOOVERWRITE part. The correct solution might instead be to handle SetupCopyOEMInf returning ERROR_FILE_EXISTS or I might be "fixing" something in the completely wrong place. It would be great if someone with some insight into setupapi (Eric? Hervé? ;]) could review this and give some pointers. Thanks! -Thomas [1] http://www.reactos.org/bugzilla/show_bug.cgi?id=6522 [2] http://www.reactos.org/bugzilla/attachment.cgi?id=6753 [3] http://www.reactos.org/testman/compare.php?ids=8272,8294,8303,8305 Patch explanation: - The first hunk isn't really required, but I guess it shouldn't break anything, and seems to find what it's looking for this way. - The second hunk is in the code path used by VBox guest additions setup. It is apparently called with an already-existing inf file, but I have no idea why. :| - The third hunk is a trivial bug that our CreateService just didn't complain about before r53872/r53886

2 1

ReactOS August and September Meeting Minutes
by Zachary Gorden 04 Oct '11

04 Oct '11

Though the August minutes were already posted on the forum, they are being resent here for people who may have missed them. August Summary A proposal was made to do winesyncs before a release to force the project to do a better job keeping things in sync and perhaps do a better job making syncs feasible/less time consuming. Rejected by plurality of votes. Questions about how/whether to continue the driver signing program was raised. An advisory vote was held and the majority wished to continue it in one form or another. Feedback based on the advisory vote was incorporated into revised guidelines posted on the Driver Signing wiki page. New projects are now required to find a sponsor ReactOS "core developer" willing to audit their code if they wish to get their driver signed. Decision to integrate arwinss into trunk under a separate directory structure and make it a compile-time option. Passed by majority vote. Decision to switch main Linux build server to use cmake. Passed by majority vote. September Summary Agenda 1. CMake Adoption Status 2. Release Preparation, Determination of Release Date 3. Webportal Upgrade Status 4. ReactOS Target Version Report 1. The build environments for both Windows and Unix have gone through several release candidates and are effectively finalized. For the Windows BE an installer release client using MSI instead of NSIS also needs to be prepared. Minor problems still seem to exist on Mac OS X when using a combination of GCC and LLVM, but these were deemed non-blockers. Building ReactOS using CMake has been reported to take more time than using rbuild, though developers are still working to verify and determine the cause. Current theory is related to changed debug format and more thorough dependency checking by CMake. At present the plan is to put the build environment release candidates on the Linux build servers and determine if there are any problems. The Windows build servers have already been running the new build environments for testing purposes. 2. Due to the significant number of regressions and overall bugginess of ReactOS' current state, release scheduling has been deferred until the next meeting. A list of regressions and bugs has already been compiled and the team intends to work its way through the reported issues in the meantime. At the next meeting, the OS' state will be re-assessed to see whether a release is viable or not. 3. Most of the modules needed to bridge Drupal with things like Bugzilla have already been completed. To speed the transition, a decision was made to retain the current website design. Once the transition is complete, the web team can go back to updating the site's theme. Desired content changes will also not block transition to the new backend. No timetable was given for when the transition would happen. 4. For a while the project adopted the goal of targeting the Windows 2003 kernel and the latest version of Windows for user mode components. Several developers however raised objections to this and presented examples where this methodology does not work. A specific example involved symbolic link support, which required Microsoft rearchitecture not only NTFS but also the kernel's security systems. Its addition in ReactOS, assuming it is done correctly, would require changes to the kernel to adopt features from the Vista kernel, thus violating the kernel target. With these considerations, the project has decided to set both the user and kernel targets to Windows 2003. Dependency on Wine for many user mode libraries actually complicates this, as Wine has been adding Vista and later APIs without proper segregation and the developers will need to figure out how to deal with this in the long run.

5 7

Re: [ros-dev] [ros-diffs] [akhaldi] 53941: [RBUILD] * Plug a leak.
by Timo Kreuzer 02 Oct '11

02 Oct '11

Am 02.10.2011 22:59, schrieb akhaldi(a)svn.reactos.org: > Author: akhaldi > Date: Sun Oct 2 20:59:15 2011 > New Revision: 53941 > > URL: http://svn.reactos.org/svn/reactos?rev=53941&view=rev > Log: > [RBUILD] > * Plug a leak. Bugfix of the month! ;-)

1 0

Tools and ways for our development
by Matthias Kupfer 02 Oct '11

02 Oct '11

Hi, at present I work for mid-sized company for ticketing, parking and mobile solutions in Germany (and Great Britain). I personally work in a project for railway services (using gsm-r network). To understand the tools given below I want to figure out our target and environment in short. We develop for embedded Linux systems with ARM-CPU and Qt-Framework. Therefore C++ was and is used as programming language. Apart from he usual tools like - make-alike build tools (written in perl - a project specific one) - regular make files for some special targets - SVN for source code management we use some interesting tools to keep the source readable and to preserve a minimum of source quality automatically (bear in mind we use C++ instead of C, for our purpose we need to alter some tools for our needs): - Hudson for automatic build and checking the source (see below) - cpplint.py (by Google) for some checking the source - cppcheck for another check of the source - doxygen for checking the missing documentation (in that special case check only by tricky configuration instead of costly generating all documentation files) - format the source code (after agreement of all devs) in a uniform style with astyle before commit (for ReactOS better as commit hook) - finally we gather all check results in one table and mark the results for hudson as stable (if no errors), failed (in case of any errors), unstable (in case of some low-prio warnings) Maybe we can think about some of them, because even if some problems of development remains, it might give us some edge and may also attract some devs. I don't make any suggestions, but I want to tell you how others work. Matthias PS: We are the first project in the company going that way and other project groups would like to adapt the way, because they see the benefit for their/other/future projects. -- Matthias Kupfer phone +49 371 236 46 52 Wilhelm-Firl-Straße 21 mobile +49 160 859 43 54 09122 Chemnitz, Germany

2 1

Re: [ros-dev] [ros-diffs] [dgorbachev] 53907: [NTOSKRNL] Use inline asm in KiIsNpxErrataPresent(). C code can be optimized in a wrong way.
by Alex Ionescu 01 Oct '11

01 Oct '11

Care to explain? If it can be optimized the wrong way -- use a pragma or fix the compiler. I hate these kinds of patches. I think Timo would agree. Best regards, Alex Ionescu On Fri, Sep 30, 2011 at 5:03 PM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Fri Sep 30 21:03:29 2011 > New Revision: 53907 > > URL: http://svn.reactos.org/svn/reactos?rev=53907&view=rev > Log: > [NTOSKRNL] > Use inline asm in KiIsNpxErrataPresent(). C code can be optimized in a > wrong way. > > Modified: > trunk/reactos/ntoskrnl/ke/i386/cpu.c > > Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Sep 30 21:03:29 > 2011 > @@ -1254,9 +1254,9 @@ > INIT_FUNCTION > KiIsNpxErrataPresent(VOID) > { > - BOOLEAN ErrataPresent; > + static double Value1 = 4195835.0, Value2 = 3145727.0; > + INT ErrataPresent; > ULONG Cr0; > - volatile double Value1, Value2; > > /* Disable interrupts */ > _disable(); > @@ -1269,9 +1269,30 @@ > Ke386FnInit(); > > /* Multiply the magic values and divide, we should get the result back > */ > - Value1 = 4195835.0; > - Value2 = 3145727.0; > - ErrataPresent = (Value1 * Value2 / 3145727.0) != 4195835.0; > +#ifdef __GNUC__ > + __asm__ __volatile__ > + ( > + "fldl %1\n\t" > + "fdivl %2\n\t" > + "fmull %2\n\t" > + "fldl %1\n\t" > + "fsubp\n\t" > + "fistpl %0\n\t" > + : "=m" (ErrataPresent) > + : "m" (Value1), > + "m" (Value2) > + ); > +#else > + __asm > + { > + fld Value1 > + fdiv Value2 > + fmul Value2 > + fld Value1 > + fsubp > + fistp ErrataPresent > + }; > +#endif > > /* Restore CR0 */ > __writecr0(Cr0); > @@ -1280,7 +1301,7 @@ > _enable(); > > /* Return if there's an errata */ > - return ErrataPresent; > + return ErrataPresent != 0; > } > > VOID > > >

4 9

trunk is broken Re: [ros-diffs] [tkreuzer] 53896: [FREELDR] - Move some disk related stuff that is unrelated to the registry data into a new file, hwdisk.c - Don't get the disk count from the size value of a structure that was pr...
by Minas Abrahamyan 01 Oct '11

01 Oct '11

Hi there, This patch is to blame (seems to, just this) or another... But trunk is broken: build stops with these messages: [COPY] output-i386\livecd\reactos\system32\ntoskrnl.exe [CC] dll\win32\shell32\shellole.cpp [RSP] obj-i386\dll\win32\shell32\shell32_objs.rsp [LD] output-i386\dll\win32\shell32\shell32.dll [PEFIXUP] output-i386\dll\win32\shell32\shell32.dll [RSYM] output-i386\dll\win32\shell32\shell32.dll [COPY] output-i386\livecd\reactos\system32\shell32.dll [LD] output-i386\boot\freeldr\freeldr\freeldr.sys obj-i386\boot\freeldr\freeldr\arch\i386\hardware_freeldr_arch.o: In function `PcHwDetect': D:/ProgBin/ros/reactos/boot/freeldr/freeldr/arch/i386/hardware.c:1710: undefined reference to `HwInitializeBiosDisks' D:/ProgBin/ros/reactos/boot/freeldr/freeldr/arch/i386/hardware.c:606: undefined reference to `PcBiosDiskCount' D:/ProgBin/ros/reactos/boot/freeldr/freeldr/arch/i386/hardware.c:694: undefined reference to `GetHarddiskIdentifier' D:/ProgBin/ros/reactos/boot/freeldr/freeldr/arch/i386/hardware.c:685: undefined reference to `PcBiosDiskCount' make.exe: *** [output-i386\boot\freeldr\freeldr\freeldr.sys] Error 1 Total Build Time: 00:01:07 D:\ProgBin\ros\reactos> Best regards, M.A. On Fri, Sep 30, 2011 at 2:12 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Thu Sep 29 21:12:40 2011 > New Revision: 53896 > > URL: http://svn.reactos.org/svn/reactos?rev=53896&view=rev > Log: > [FREELDR] > - Move some disk related stuff that is unrelated to the registry data into a new file, hwdisk.c > - Don't get the disk count from the size value of a structure that was previously calculated from the disk count, but instead save it in a global variable. > - Initialize certain data in a better place > > Added: > trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c (with props) > Modified: > trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c > trunk/reactos/boot/freeldr/freeldr/debug.c > trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild > trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c > > Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -83,6 +83,7 @@ > arch/i386/hardware.c > arch/i386/hwacpi.c > arch/i386/hwapm.c > + arch/i386/hwdisk.c > arch/i386/hwpci.c > arch/i386/i386bug.c > arch/i386/i386disk.c > > Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -82,12 +82,16 @@ > > DBG_DEFAULT_CHANNEL(HWDETECT); > > -static CHAR Hex[] = "0123456789abcdef"; > static unsigned int delay_count = 1; > > -extern ULONG reactos_disk_count; > -extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; > -extern char reactos_arc_strings[32][256]; > +extern UCHAR PcBiosDiskCount; > + > +PCHAR > +GetHarddiskIdentifier( > + UCHAR DriveNumber); > + > +VOID > +HwInitializeBiosDisks(VOID); > > /* FUNCTIONS ****************************************************************/ > > @@ -402,218 +406,6 @@ > return PartialResourceList; > } > > -typedef struct tagDISKCONTEXT > -{ > - UCHAR DriveNumber; > - ULONG SectorSize; > - ULONGLONG SectorOffset; > - ULONGLONG SectorCount; > - ULONGLONG SectorNumber; > -} DISKCONTEXT; > - > -static LONG DiskClose(ULONG FileId) > -{ > - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > - > - MmHeapFree(Context); > - return ESUCCESS; > -} > - > -static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) > -{ > - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > - > - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); > - Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; > - Information->CurrentAddress.QuadPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; > - > - return ESUCCESS; > -} > - > -static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) > -{ > - DISKCONTEXT* Context; > - UCHAR DriveNumber; > - ULONG DrivePartition, SectorSize; > - ULONGLONG SectorOffset = 0; > - ULONGLONG SectorCount = 0; > - PARTITION_TABLE_ENTRY PartitionTableEntry; > - CHAR FileName[1]; > - > - if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) > - return EINVAL; > - > - if (DrivePartition == 0xff) > - { > - /* This is a CD-ROM device */ > - SectorSize = 2048; > - } > - else > - { > - /* This is either a floppy disk device (DrivePartition == 0) or > - * a hard disk device (DrivePartition != 0 && DrivePartition != 0xFF) but > - * it doesn't matter which one because they both have 512 bytes per sector */ > - SectorSize = 512; > - } > - > - if (DrivePartition != 0xff && DrivePartition != 0) > - { > - if (!DiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) > - return EINVAL; > - SectorOffset = PartitionTableEntry.SectorCountBeforePartition; > - SectorCount = PartitionTableEntry.PartitionSectorCount; > - } > - > - Context = MmHeapAlloc(sizeof(DISKCONTEXT)); > - if (!Context) > - return ENOMEM; > - Context->DriveNumber = DriveNumber; > - Context->SectorSize = SectorSize; > - Context->SectorOffset = SectorOffset; > - Context->SectorCount = SectorCount; > - Context->SectorNumber = 0; > - FsSetDeviceSpecific(*FileId, Context); > - > - return ESUCCESS; > -} > - > -static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) > -{ > - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > - UCHAR* Ptr = (UCHAR*)Buffer; > - ULONG i, Length; > - BOOLEAN ret; > - > - *Count = 0; > - i = 0; > - while (N > 0) > - { > - Length = N; > - if (Length > Context->SectorSize) > - Length = Context->SectorSize; > - ret = MachDiskReadLogicalSectors( > - Context->DriveNumber, > - Context->SectorNumber + Context->SectorOffset + i, > - 1, > - (PVOID)DISKREADBUFFER); > - if (!ret) > - return EIO; > - RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); > - Ptr += Length; > - *Count += Length; > - N -= Length; > - i++; > - } > - > - return ESUCCESS; > -} > - > -static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) > -{ > - DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > - > - if (SeekMode != SeekAbsolute) > - return EINVAL; > - if (Position->LowPart & (Context->SectorSize - 1)) > - return EINVAL; > - > - /* FIXME: take HighPart into account */ > - Context->SectorNumber = Position->LowPart / Context->SectorSize; > - return ESUCCESS; > -} > - > -static const DEVVTBL DiskVtbl = { > - DiskClose, > - DiskGetFileInformation, > - DiskOpen, > - DiskRead, > - DiskSeek, > -}; > - > -static VOID > -GetHarddiskIdentifier(PCHAR Identifier, > - UCHAR DriveNumber) > -{ > - PMASTER_BOOT_RECORD Mbr; > - ULONG *Buffer; > - ULONG i; > - ULONG Checksum; > - ULONG Signature; > - CHAR ArcName[256]; > - PARTITION_TABLE_ENTRY PartitionTableEntry; > - > - /* Read the MBR */ > - if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) > - { > - ERR("Reading MBR failed\n"); > - return; > - } > - > - Buffer = (ULONG*)DISKREADBUFFER; > - Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; > - > - Signature = Mbr->Signature; > - TRACE("Signature: %x\n", Signature); > - > - /* Calculate the MBR checksum */ > - Checksum = 0; > - for (i = 0; i < 128; i++) > - { > - Checksum += Buffer[i]; > - } > - Checksum = ~Checksum + 1; > - TRACE("Checksum: %x\n", Checksum); > - > - /* Fill out the ARC disk block */ > - reactos_arc_disk_info[reactos_disk_count].Signature = Signature; > - reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; > - sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); > - strcpy(reactos_arc_strings[reactos_disk_count], ArcName); > - reactos_arc_disk_info[reactos_disk_count].ArcName = > - reactos_arc_strings[reactos_disk_count]; > - reactos_disk_count++; > - > - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); > - FsRegisterDevice(ArcName, &DiskVtbl); > - > - /* Add partitions */ > - i = 1; > - DiskReportError(FALSE); > - while (DiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) > - { > - if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) > - { > - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(%lu)", DriveNumber - 0x80, i); > - FsRegisterDevice(ArcName, &DiskVtbl); > - } > - i++; > - } > - DiskReportError(TRUE); > - > - /* Convert checksum and signature to identifier string */ > - Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; > - Identifier[1] = Hex[(Checksum >> 24) & 0x0F]; > - Identifier[2] = Hex[(Checksum >> 20) & 0x0F]; > - Identifier[3] = Hex[(Checksum >> 16) & 0x0F]; > - Identifier[4] = Hex[(Checksum >> 12) & 0x0F]; > - Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; > - Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; > - Identifier[7] = Hex[Checksum & 0x0F]; > - Identifier[8] = '-'; > - Identifier[9] = Hex[(Signature >> 28) & 0x0F]; > - Identifier[10] = Hex[(Signature >> 24) & 0x0F]; > - Identifier[11] = Hex[(Signature >> 20) & 0x0F]; > - Identifier[12] = Hex[(Signature >> 16) & 0x0F]; > - Identifier[13] = Hex[(Signature >> 12) & 0x0F]; > - Identifier[14] = Hex[(Signature >> 8) & 0x0F]; > - Identifier[15] = Hex[(Signature >> 4) & 0x0F]; > - Identifier[16] = Hex[Signature & 0x0F]; > - Identifier[17] = '-'; > - Identifier[18] = 'A'; > - Identifier[19] = 0; > - TRACE("Identifier: %s\n", Identifier); > -} > - > static UCHAR > GetFloppyCount(VOID) > { > @@ -810,37 +602,8 @@ > UCHAR DiskCount; > USHORT i; > ULONG Size; > - BOOLEAN Changed; > - > - /* Count the number of visible drives */ > - DiskReportError(FALSE); > - DiskCount = 0; > - > - /* There are some really broken BIOSes out there. There are even BIOSes > - * that happily report success when you ask them to read from non-existent > - * harddisks. So, we set the buffer to known contents first, then try to > - * read. If the BIOS reports success but the buffer contents haven't > - * changed then we fail anyway */ > - memset((PVOID) DISKREADBUFFER, 0xcd, 512); > - while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) > - { > - Changed = FALSE; > - for (i = 0; ! Changed && i < 512; i++) > - { > - Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; > - } > - if (! Changed) > - { > - TRACE("BIOS reports success for disk %d but data didn't change\n", > - (int)DiskCount); > - break; > - } > - DiskCount++; > - memset((PVOID) DISKREADBUFFER, 0xcd, 512); > - } > - DiskReportError(TRUE); > - TRACE("BIOS reports %d harddisk%s\n", > - (int)DiskCount, (DiskCount == 1) ? "": "s"); > + > + DiskCount = PcBiosDiskCount; > > /* Allocate resource descriptor */ > Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + > @@ -900,49 +663,11 @@ > return SystemKey; > } > > -static UCHAR > -GetDiskCount(PCONFIGURATION_COMPONENT_DATA BusKey) > -{ > - PCONFIGURATION_COMPONENT_DATA System; > - ULONG ConfigurationDataLength; > - UCHAR DiskCount = 0; > - > - // > - // Get root component > - // > - System = BusKey; > - while (System->Parent) > - System = System->Parent; > - > - // > - // Get root configuration data length > - // > - ConfigurationDataLength = System->ComponentEntry.ConfigurationDataLength; > - > - // > - // We assume that nothing wrong happened, and that configuration > - // only consists of one CM_PARTIAL_RESOURCE_LIST entry, followed > - // by n entries of CM_INT13_DRIVE_PARAMETER > - // > - if (ConfigurationDataLength > 0) > - DiskCount = (UCHAR)((ConfigurationDataLength - sizeof(CM_PARTIAL_RESOURCE_LIST)) > - / sizeof(CM_INT13_DRIVE_PARAMETER)); > - > - // > - // Return number of disks > - // > - TRACE("Retrieving %lu INT13 disks\\0\n", DiskCount); > - return DiskCount; > -}; > - > static VOID > DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA BusKey) > { > PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; > - BOOLEAN BootDriveReported = FALSE; > ULONG i; > - UCHAR DiskCount = GetDiskCount(BusKey); > - CHAR BootPath[512]; > > FldrCreateComponentKey(BusKey, > ControllerClass, > @@ -957,19 +682,16 @@ > TRACE("Created key: DiskController\\0\n"); > > /* Create and fill subkey for each harddisk */ > - for (i = 0; i < DiskCount; i++) > + for (i = 0; i < PcBiosDiskCount; i++) > { > PCM_PARTIAL_RESOURCE_LIST PartialResourceList; > ULONG Size; > - CHAR Identifier[20]; > + PCHAR Identifier; > UCHAR DriveNumber = 0x80 + (UCHAR)i; > - > - if (FrldrBootDrive == DriveNumber) > - BootDriveReported = TRUE; > > /* Get disk values */ > PartialResourceList = GetHarddiskConfigurationData(DriveNumber, &Size); > - GetHarddiskIdentifier(Identifier, DriveNumber); > + Identifier = GetHarddiskIdentifier(DriveNumber); > > /* Create disk key */ > FldrCreateComponentKey(ControllerKey, > @@ -984,40 +706,6 @@ > &DiskKey); > } > > - /* Get the drive we're booting from */ > - MachDiskGetBootPath(BootPath, sizeof(BootPath)); > - > - /* Add it, if it's a floppy or cdrom */ > - if ((FrldrBootDrive >= 0x80 && !BootDriveReported) || > - DiskIsDriveRemovable(FrldrBootDrive)) > - { > - /* TODO: Check if it's really a cdrom drive */ > - ULONG* Buffer; > - ULONG Checksum = 0; > - > - /* Read the MBR */ > - if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) > - { > - ERR("Reading MBR failed\n"); > - return; > - } > - > - Buffer = (ULONG*)DISKREADBUFFER; > - > - /* Calculate the MBR checksum */ > - for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; > - Checksum = ~Checksum + 1; > - TRACE("Checksum: %x\n", Checksum); > - > - /* Fill out the ARC disk block */ > - reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; > - strcpy(reactos_arc_strings[reactos_disk_count], BootPath); > - reactos_arc_disk_info[reactos_disk_count].ArcName = > - reactos_arc_strings[reactos_disk_count]; > - reactos_disk_count++; > - > - FsRegisterDevice(BootPath, &DiskVtbl); > - } > } > > static VOID > @@ -2019,6 +1707,8 @@ > > TRACE("DetectHardware()\n"); > > + HwInitializeBiosDisks(); > + > /* Create the 'System' key */ > SystemKey = DetectSystem(); > > > Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c (added) > +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -1,0 +1,342 @@ > +/* > + * FreeLoader > + * > + * Copyright (C) 2003, 2004 Eric Kohl > + * Copyright (C) 2009 Hervé Poussineau > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + */ > + > +#include <freeldr.h> > + > +#define NDEBUG > +#include <debug.h> > + > +DBG_DEFAULT_CHANNEL(HWDETECT); > + > +typedef struct tagDISKCONTEXT > +{ > + UCHAR DriveNumber; > + ULONG SectorSize; > + ULONGLONG SectorOffset; > + ULONGLONG SectorCount; > + ULONGLONG SectorNumber; > +} DISKCONTEXT; > + > +extern ULONG reactos_disk_count; > +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; > +extern char reactos_arc_strings[32][256]; > + > +static CHAR Hex[] = "0123456789abcdef"; > +UCHAR PcBiosDiskCount = 0; > +CHAR PcDiskIdentifier[32][20]; > + > + > +static LONG DiskClose(ULONG FileId) > +{ > + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > + > + MmHeapFree(Context); > + return ESUCCESS; > +} > + > +static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) > +{ > + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > + > + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); > + Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; > + Information->CurrentAddress.QuadPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; > + > + return ESUCCESS; > +} > + > +static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) > +{ > + DISKCONTEXT* Context; > + UCHAR DriveNumber; > + ULONG DrivePartition, SectorSize; > + ULONGLONG SectorOffset = 0; > + ULONGLONG SectorCount = 0; > + PARTITION_TABLE_ENTRY PartitionTableEntry; > + CHAR FileName[1]; > + > + if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) > + return EINVAL; > + > + if (DrivePartition == 0xff) > + { > + /* This is a CD-ROM device */ > + SectorSize = 2048; > + } > + else > + { > + /* This is either a floppy disk device (DrivePartition == 0) or > + * a hard disk device (DrivePartition != 0 && DrivePartition != 0xFF) but > + * it doesn't matter which one because they both have 512 bytes per sector */ > + SectorSize = 512; > + } > + > + if (DrivePartition != 0xff && DrivePartition != 0) > + { > + if (!DiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) > + return EINVAL; > + SectorOffset = PartitionTableEntry.SectorCountBeforePartition; > + SectorCount = PartitionTableEntry.PartitionSectorCount; > + } > + > + Context = MmHeapAlloc(sizeof(DISKCONTEXT)); > + if (!Context) > + return ENOMEM; > + Context->DriveNumber = DriveNumber; > + Context->SectorSize = SectorSize; > + Context->SectorOffset = SectorOffset; > + Context->SectorCount = SectorCount; > + Context->SectorNumber = 0; > + FsSetDeviceSpecific(*FileId, Context); > + > + return ESUCCESS; > +} > + > +static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) > +{ > + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > + UCHAR* Ptr = (UCHAR*)Buffer; > + ULONG i, Length; > + BOOLEAN ret; > + > + *Count = 0; > + i = 0; > + while (N > 0) > + { > + Length = N; > + if (Length > Context->SectorSize) > + Length = Context->SectorSize; > + ret = MachDiskReadLogicalSectors( > + Context->DriveNumber, > + Context->SectorNumber + Context->SectorOffset + i, > + 1, > + (PVOID)DISKREADBUFFER); > + if (!ret) > + return EIO; > + RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); > + Ptr += Length; > + *Count += Length; > + N -= Length; > + i++; > + } > + > + return ESUCCESS; > +} > + > +static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) > +{ > + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); > + > + if (SeekMode != SeekAbsolute) > + return EINVAL; > + if (Position->LowPart & (Context->SectorSize - 1)) > + return EINVAL; > + > + /* FIXME: take HighPart into account */ > + Context->SectorNumber = Position->LowPart / Context->SectorSize; > + return ESUCCESS; > +} > + > +static const DEVVTBL DiskVtbl = { > + DiskClose, > + DiskGetFileInformation, > + DiskOpen, > + DiskRead, > + DiskSeek, > +}; > + > +PCHAR > +GetHarddiskIdentifier( > + UCHAR DriveNumber) > +{ > + return PcDiskIdentifier[DriveNumber - 0x80]; > +} > + > +VOID > +GetHarddiskInformation( > + UCHAR DriveNumber) > +{ > + PMASTER_BOOT_RECORD Mbr; > + ULONG *Buffer; > + ULONG i; > + ULONG Checksum; > + ULONG Signature; > + CHAR ArcName[256]; > + PARTITION_TABLE_ENTRY PartitionTableEntry; > + PCHAR Identifier = PcDiskIdentifier[DriveNumber - 0x80]; > + > + /* Read the MBR */ > + if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) > + { > + ERR("Reading MBR failed\n"); > + return; > + } > + > + Buffer = (ULONG*)DISKREADBUFFER; > + Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; > + > + Signature = Mbr->Signature; > + TRACE("Signature: %x\n", Signature); > + > + /* Calculate the MBR checksum */ > + Checksum = 0; > + for (i = 0; i < 128; i++) > + { > + Checksum += Buffer[i]; > + } > + Checksum = ~Checksum + 1; > + TRACE("Checksum: %x\n", Checksum); > + > + /* Fill out the ARC disk block */ > + reactos_arc_disk_info[reactos_disk_count].Signature = Signature; > + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; > + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); > + strcpy(reactos_arc_strings[reactos_disk_count], ArcName); > + reactos_arc_disk_info[reactos_disk_count].ArcName = > + reactos_arc_strings[reactos_disk_count]; > + reactos_disk_count++; > + > + sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); > + FsRegisterDevice(ArcName, &DiskVtbl); > + > + /* Add partitions */ > + i = 1; > + DiskReportError(FALSE); > + while (DiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) > + { > + if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) > + { > + sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(%lu)", DriveNumber - 0x80, i); > + FsRegisterDevice(ArcName, &DiskVtbl); > + } > + i++; > + } > + DiskReportError(TRUE); > + > + /* Convert checksum and signature to identifier string */ > + Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; > + Identifier[1] = Hex[(Checksum >> 24) & 0x0F]; > + Identifier[2] = Hex[(Checksum >> 20) & 0x0F]; > + Identifier[3] = Hex[(Checksum >> 16) & 0x0F]; > + Identifier[4] = Hex[(Checksum >> 12) & 0x0F]; > + Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; > + Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; > + Identifier[7] = Hex[Checksum & 0x0F]; > + Identifier[8] = '-'; > + Identifier[9] = Hex[(Signature >> 28) & 0x0F]; > + Identifier[10] = Hex[(Signature >> 24) & 0x0F]; > + Identifier[11] = Hex[(Signature >> 20) & 0x0F]; > + Identifier[12] = Hex[(Signature >> 16) & 0x0F]; > + Identifier[13] = Hex[(Signature >> 12) & 0x0F]; > + Identifier[14] = Hex[(Signature >> 8) & 0x0F]; > + Identifier[15] = Hex[(Signature >> 4) & 0x0F]; > + Identifier[16] = Hex[Signature & 0x0F]; > + Identifier[17] = '-'; > + Identifier[18] = 'A'; > + Identifier[19] = 0; > + TRACE("Identifier: %s\n", Identifier); > +} > + > + > +VOID > +HwInitializeBiosDisks(VOID) > +{ > + UCHAR DiskCount, DriveNumber; > + ULONG i; > + BOOLEAN Changed; > + CHAR BootPath[512]; > + BOOLEAN BootDriveReported = FALSE; > + > + /* Count the number of visible drives */ > + DiskReportError(FALSE); > + DiskCount = 0; > + DriveNumber = 0x80; > + > + /* There are some really broken BIOSes out there. There are even BIOSes > + * that happily report success when you ask them to read from non-existent > + * harddisks. So, we set the buffer to known contents first, then try to > + * read. If the BIOS reports success but the buffer contents haven't > + * changed then we fail anyway */ > + memset((PVOID) DISKREADBUFFER, 0xcd, 512); > + while (MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) > + { > + Changed = FALSE; > + for (i = 0; ! Changed && i < 512; i++) > + { > + Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; > + } > + if (! Changed) > + { > + TRACE("BIOS reports success for disk %d but data didn't change\n", > + (int)DiskCount); > + break; > + } > + > + GetHarddiskInformation(DriveNumber); > + > + if (FrldrBootDrive == DriveNumber) > + BootDriveReported = TRUE; > + > + DiskCount++; > + DriveNumber++; > + memset((PVOID) DISKREADBUFFER, 0xcd, 512); > + } > + DiskReportError(TRUE); > + TRACE("BIOS reports %d harddisk%s\n", > + (int)DiskCount, (DiskCount == 1) ? "": "s"); > + > + /* Get the drive we're booting from */ > + MachDiskGetBootPath(BootPath, sizeof(BootPath)); > + > + /* Add it, if it's a floppy or cdrom */ > + if ((FrldrBootDrive >= 0x80 && !BootDriveReported) || > + DiskIsDriveRemovable(FrldrBootDrive)) > + { > + /* TODO: Check if it's really a cdrom drive */ > + ULONG* Buffer; > + ULONG Checksum = 0; > + > + /* Read the MBR */ > + if (!MachDiskReadLogicalSectors(FrldrBootDrive, 16ULL, 1, (PVOID)DISKREADBUFFER)) > + { > + ERR("Reading MBR failed\n"); > + return; > + } > + > + Buffer = (ULONG*)DISKREADBUFFER; > + > + /* Calculate the MBR checksum */ > + for (i = 0; i < 2048 / sizeof(ULONG); i++) Checksum += Buffer[i]; > + Checksum = ~Checksum + 1; > + TRACE("Checksum: %x\n", Checksum); > + > + /* Fill out the ARC disk block */ > + reactos_arc_disk_info[reactos_disk_count].CheckSum = Checksum; > + strcpy(reactos_arc_strings[reactos_disk_count], BootPath); > + reactos_arc_disk_info[reactos_disk_count].ArcName = > + reactos_arc_strings[reactos_disk_count]; > + reactos_disk_count++; > + > + FsRegisterDevice(BootPath, &DiskVtbl); > + } > + > + PcBiosDiskCount = DiskCount; > +} > > Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/boot/freeldr/freeldr/debug.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -289,7 +289,6 @@ > } > > //DECLSPEC_NORETURN > -NTKERNELAPI > VOID > NTAPI > KeBugCheckEx( > > Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -19,6 +19,7 @@ > <file>hardware.c</file> > <file>hwacpi.c</file> > <file>hwapm.c</file> > + <file>hwdisk.c</file> > <file>hwpci.c</file> > <file>i386bug.c</file> > <file>i386disk.c</file> > > Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c [iso-8859-1] Thu Sep 29 21:12:40 2011 > @@ -18,6 +18,8 @@ > */ > > #include <freeldr.h> > +#include <debug.h> > +DBG_DEFAULT_CHANNEL(INIFILE); > > static LONG IniOpenIniFile(ULONG* FileId) > { > @@ -44,6 +46,7 @@ > ULONG FreeLoaderIniFileSize, Count; > LONG ret; > BOOLEAN Success; > + TRACE("IniFileInitialize()\n"); > > // > // Open freeldr.ini > > >

7 9

NDK
by dmex 30 Sep '11

30 Sep '11

The NDK has allot of 64bit alignment issues mostly from omitted SIZE_T fields, There's at least 20 or so other structures with issues but here's two corrected structures below: typedef struct _SYSTEM_VERIFIER_INFORMATION { ULONG NextEntryOffset; ULONG Level; UNICODE_STRING DriverName; ULONG RaiseIrqls; ULONG AcquireSpinLocks; ULONG SynchronizeExecutions; ULONG AllocationsAttempted; ULONG AllocationsSucceeded; ULONG AllocationsSucceededSpecialPool; ULONG AllocationsWithNoTag; ULONG TrimRequests; ULONG Trims; ULONG AllocationsFailed; ULONG AllocationsFailedDeliberately; ULONG Loads; ULONG Unloads; ULONG UnTrackedPool; ULONG CurrentPagedPoolAllocations; ULONG CurrentNonPagedPoolAllocations; ULONG PeakPagedPoolAllocations; ULONG PeakNonPagedPoolAllocations; SIZE_T PagedPoolUsageInBytes; SIZE_T NonPagedPoolUsageInBytes; SIZE_T PeakPagedPoolUsageInBytes; SIZE_T PeakNonPagedPoolUsageInBytes; } SYSTEM_VERIFIER_INFORMATION, *PSYSTEM_VERIFIER_INFORMATION; // Class 22 typedef struct _SYSTEM_POOLTAG { union { UCHAR Tag[4]; ULONG TagUlong; }; ULONG PagedAllocs; ULONG PagedFrees; SIZE_T PagedUsed; ULONG NonPagedAllocs; ULONG NonPagedFrees; SIZE_T NonPagedUsed; } SYSTEM_POOLTAG, *PSYSTEM_POOLTAG;

4 4

Services interruptions
by Pierre Schweitzer 29 Sep '11

29 Sep '11

Hi, due to a HDD failure in one of our major servers, you've been encountering services interruptions (mail, svn, web, mainly) this afternoon and tonight. The issue has been successfully addressed right now, and the server is back online with its new hard-drive. Regards, The ReactOS sysadmins.

1 0

September Status Meeting
by Aleksey Bragin 29 Sep '11

29 Sep '11

Hi, this is a reminder about the Status meeting, which is to happen tomorrow, 29th of September at 19:00 UTC. Please don't miss it. The meeting is declared private. I will lead the meeting, as usual. Proposed agenda for the meeting: 1. CMake adoption progress. 2. Release preparation status report, deciding on the release date. 3. Webportal upgrade plans. 4. ReactOS target version: strict sticking to it or hybrid. List of participants: - Giannis Adamopoulos (smiley1_) - Johannes Anderwald (janderwald) - Javier Agustìn Fernàndez Arroyo (elhoir) - Maciej Bialas (niski) - Jan Blomqvist-Kinander (JaixBly) - Aleksey Bragin (abragin) - Thomas Faber (ThFabba) - Colin Finck (Colin_Finck) - Jérôme Gardou (zefklop) - Danny Götte (dangerground) - Cameron Gutman (aicom) - Ziliang Guo (ZWabbit) - Rafal Harabien (rafalh) - Andrew Hill (ash77) - Kamil Hornicek (Pigglesworth) - Gabriel Ilardi (gabriel_it) - Alex Ionescu (Alex_Ionescu) - Amine Khaldi (AmineKhaldi) - Igor Koshpaev (tower) - Timo Kreuzer (tkreuzer) - Matthias Kupfer (Collibri) - Michael Martin (mjmartin) - Victor Martinez (vicmarcal) - Roel Messiant (Mephisto) - Claudiu Mihail (KlausM) - Andrew Munger (WaxDragon) - Ged Murphy (GedMurphy) - Igor Paliychuk (igorko) - Sylvain Petreolle (Usurp) - Hervé Poussineau (hpoussin) - Daniel Reimer (dreimer) - Pierre Schweitzer (HeisSpiter) - Samuel Serapion (encoded) - Olaf Siejka (Caemyr) - James Tabor (jimtabor) - Christoph von Wittich (Christoph_vW) - Art Yerkes (arty) WBR, Aleksey Bragin.

4 4

Interesting article
by Aleksey Bragin 29 Sep '11

29 Sep '11

FYI: This is Linus' interview. http://h30565.www3.hp.com/t5/Feature- Articles/Linus-Torvalds-s-Lessons-on-Software-Development-Management/ ba-p/440 He very correctly outlines many things. One of the most important: "The other thing—and it's kind of related—that people seem to get wrong is to think that the code they write is what matters. No, even if you wrote 100% of the code, and even if you are the best programmer in the world and will never need any help with the project at all, the thing that really matters is the users of the code. The code itself is unimportant; the project is only as useful as people actually find it.” And this: "Way too many projects seem to think that the code is more important than the user, and they break things left and right, and they don't apologize for it, because they feel that they are ‘fixing’ the code and doing the right thing.” WBR, Aleksey Bragin.

5 9

ACPI enabled on Linux Testslave
by Colin Finck 27 Sep '11

27 Sep '11

Hi all, Just for your information, I have enabled ACPI for the KVM machine used by the Linux Testslave today. For reference, the full VM configuration is like this: * QEMU/KVM-based i686 ACPI machine * 256MB of RAM * 512MB HDD on IDE Primary Master * ReactOS ISO on IDE Secondary Master * AMD PCNet-compatible Network Adapter * COM1 port redirected to a virtual Linux terminal device * PS/2 mouse * Tablet pointing device on USB Usually useful if any KVM machine is controlled over VNC, but probably not relevant for ReactOS yet. As you see, there is no virtual sound card (disabled as of 2011-06-07 due to r52098 according to my notes). Is this still correct? - Colin

3 2

Usual build breakage rant again...
by caemyr＠myopera.com 25 Sep '11

25 Sep '11

Wont be that usual. Happened twice today, still broken atm. I`m not a dev, hence i have no idea how the devs commit stuff works and all the problems you guys have to overcome... I suppose it is too difficult for you simply to visit http://build.reactos.org/waterfall and just check if its all green (yes, no need to check stdio, just noticing the color). Your time is probably too precious to wait up to 5 bloody minutes, to see if previous build was ok... I`m not even talking about runtime regressions. Its understandable, that 45 minutes is often too much to wait, but 5?? I`m not even talking about patchbot, why should I? Already did, already tried, to no effect. If you really care about ROS, then by commiting on a broken trunk, you are practically shooting yourself in your foot. Trunk will be most likely not fixed until several other commits, sometimes a day or so. ISO will not be build. Commits will not be tested, neither by automation, nor by community, bugs will not be reported and regressions will only be found in more distant future. Then, you will ask for regtesting. You should better start doing it yourself, because you guys too often are not doing even the simplest things to keep trunk clean and working, making development harder for everyone around! -- With best regards Caemyr

3 3

Compiler warnings
by Dmitry Gorbachev 24 Sep '11

24 Sep '11

Hi, Are there any bugs: /reactos/dll/directx/ksproxy/allocator.cpp: In member function 'void CKsAllocator::FreeMediaSamples()': /reactos/dll/directx/ksproxy/allocator.cpp:586:16: warning: deleting object of abstract class type 'IMediaSample' which has non-virtual destructor will cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/dll/directx/ksproxy/proxy.cpp: In function 'HRESULT CKsProxy_Constructor(IUnknown*, const IID&, void**)': /reactos/dll/directx/ksproxy/proxy.cpp:3188:16: warning: deleting object of polymorphic class type 'CKsProxy' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] In file included from /reactos/dll/win32/browseui/precomp.h:8:0, from /reactos/dll/win32/browseui/browseui.cpp:21: /reactos/lib/atl/atlcom.h: In instantiation of 'static HRESULT ATL::CComCreator<T1>::CreateInstance(void*, const IID&, void**) [with T1 = ATL::CComObjectCached<ATL::CComClassFactory>, HRESULT = int, IID = _GUID, LPVOID = void*]': /reactos/dll/win32/browseui/browseui.cpp:32:1: required from here /reactos/lib/atl/atlcom.h:253:5: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/lib/atl/atlcom.h: In instantiation of 'ULONG ATL::CComObjectCached<Base>::Release() [with Base = ATL::CComClassFactory, ULONG = unsigned int]': /reactos/dll/win32/browseui/browseui.cpp:121:1: required from here /reactos/lib/atl/atlcom.h:304:4: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] In file included from /reactos/dll/win32/shell32/precomp.h:50:0, from /reactos/dll/win32/shell32/shell32_main.cpp:22: /reactos/lib/atl/atlcom.h: In instantiation of 'static HRESULT ATL::CComCreator<T1>::CreateInstance(void*, const IID&, void**) [with T1 = ATL::CComObjectCached<ATL::CComClassFactory>, HRESULT = long int, IID = _GUID, LPVOID = void*]': /reactos/dll/win32/shell32/shell32_main.cpp:1273:1: required from here /reactos/lib/atl/atlcom.h:253:5: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/lib/atl/atlcom.h: In instantiation of 'ULONG ATL::CComObjectCached<Base>::Release() [with Base = ATL::CComClassFactory, ULONG = long unsigned int]': /reactos/dll/win32/shell32/shell32_main.cpp:1478:1: required from here /reactos/lib/atl/atlcom.h:304:4: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In member function 'virtual ULONG CMiniportDMusUART::Release()': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:114:20: warning: deleting object of polymorphic class type 'CMiniportDMusUART' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In member function 'virtual ULONG CMiniportDMusUARTStream::Release()': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:239:20: warning: deleting object of polymorphic class type 'CMiniportDMusUARTStream' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In function 'NTSTATUS NewMiniportDMusUART(IMiniport**, const CLSID&)': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:1274:16: warning: deleting object of polymorphic class type 'CMiniportDMusUART' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor]

1 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 53823: [KERNEL32] Simplify overcomplicated function CreateHardlinkW(), and SEHify it.
by Alex Ionescu 24 Sep '11

24 Sep '11

Why are you putting SEH everywhere??? Just to avoid goto? This is infinitely retarded. Exceptions should not be used as a mechanism for flow control. Best regards, Alex Ionescu On Sat, Sep 24, 2011 at 3:51 AM, <pschweitzer(a)svn.reactos.org> wrote: > Author: pschweitzer > Date: Sat Sep 24 07:51:21 2011 > New Revision: 53823 > > URL: http://svn.reactos.org/svn/reactos?rev=53823&view=rev > Log: > [KERNEL32] > Simplify overcomplicated function CreateHardlinkW(), and SEHify it. > > Modified: > trunk/reactos/dll/win32/kernel32/client/file/hardlink.c > > Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] > Sat Sep 24 07:51:21 2011 > @@ -2,11 +2,10 @@ > * > * COPYRIGHT: See COPYING in the top level directory > * PROJECT: ReactOS system libraries > - * FILE: lib/kernel32/file/hardlink.c > + * FILE: dll/win32/kernel32/client/file/hardlink.c > * PURPOSE: Hardlink functions > * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) > - * UPDATE HISTORY: > - * Created 13/03/2004 > + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) > */ > > /* INCLUDES > *****************************************************************/ > @@ -27,169 +26,110 @@ > LPCWSTR lpExistingFileName, > LPSECURITY_ATTRIBUTES lpSecurityAttributes) > { > - UNICODE_STRING LinkTarget, LinkName; > - LPVOID lpSecurityDescriptor; > - PFILE_LINK_INFORMATION LinkInformation; > - IO_STATUS_BLOCK IoStatus; > - NTSTATUS Status; > - BOOL Ret = FALSE; > + NTSTATUS Status; > + BOOL Ret = FALSE; > + ULONG NeededSize; > + IO_STATUS_BLOCK IoStatusBlock; > + OBJECT_ATTRIBUTES ObjectAttributes; > + HANDLE hTarget = INVALID_HANDLE_VALUE; > + PFILE_LINK_INFORMATION LinkInformation = NULL; > + UNICODE_STRING LinkTarget = {0, 0, NULL}, LinkName = {0, 0, NULL}; > > - if(!lpFileName || !lpExistingFileName) > - { > - SetLastError(ERROR_INVALID_PARAMETER); > - return FALSE; > - } > + TRACE("CreateHardLinkW: %S, %S, %p\n", lpFileName, lpExistingFileName, > lpSecurityAttributes); > > - lpSecurityDescriptor = (lpSecurityAttributes ? > lpSecurityAttributes->lpSecurityDescriptor : NULL); > + /* Validate parameters */ > + if(!lpFileName || !lpExistingFileName) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > > - if(RtlDetermineDosPathNameType_U((LPWSTR)lpFileName) == 1 || > - RtlDetermineDosPathNameType_U((LPWSTR)lpExistingFileName) == 1) > - { > - WARN("CreateHardLinkW() cannot handle UNC Paths!\n"); > - SetLastError(ERROR_INVALID_NAME); > - return FALSE; > - } > + _SEH2_TRY > + { > + /* Get target UNC path */ > + if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, > NULL, NULL)) > + { > + SetLastError(ERROR_PATH_NOT_FOUND); > + _SEH2_LEAVE; > + } > > - if(RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, > NULL)) > - { > - ULONG NeededSize = RtlGetFullPathName_U((LPWSTR)lpExistingFileName, 0, > NULL, NULL); > - if(NeededSize > 0) > + /* Open target */ > + InitializeObjectAttributes(&ObjectAttributes, > + &LinkTarget, > + OBJ_CASE_INSENSITIVE, > + NULL, > + (lpSecurityAttributes ? > lpSecurityAttributes->lpSecurityDescriptor : NULL)); > + > + Status = NtOpenFile(&hTarget, > + SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, > + &ObjectAttributes, > + &IoStatusBlock, > + FILE_SHARE_READ | FILE_SHARE_WRITE | > FILE_SHARE_DELETE, > + FILE_SYNCHRONOUS_IO_NONALERT | > FILE_OPEN_REPARSE_POINT); > + if (!NT_SUCCESS(Status)) > + { > + BaseSetLastNTError(Status); > + _SEH2_LEAVE; > + } > + > + /* Get UNC path name for link */ > + if (!RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, > NULL)) > + { > + SetLastError(ERROR_PATH_NOT_FOUND); > + _SEH2_LEAVE; > + } > + > + /* Prepare data for link */ > + NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length; > + LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, > NeededSize); > + if (!LinkInformation) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + _SEH2_LEAVE; > + } > + > + RtlMoveMemory(LinkInformation->FileName, LinkName.Buffer, > LinkName.Length); > + LinkInformation->ReplaceIfExists = FALSE; > + LinkInformation->RootDirectory = 0; > + LinkInformation->FileNameLength = LinkName.Length; > + > + /* Create hard link */ > + Status = NtSetInformationFile(hTarget, > + &IoStatusBlock, > + LinkInformation, > + NeededSize, > + FileLinkInformation); > + if (NT_SUCCESS(Status)) > + { > + Ret = TRUE; > + } > + } > + _SEH2_FINALLY > { > - LPWSTR lpNtLinkTarget = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, NeededSize * sizeof(WCHAR)); > - if(lpNtLinkTarget != NULL) > - { > - LPWSTR lpFilePart; > + if (LinkTarget.Buffer) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); > + } > > - if(RtlGetFullPathName_U((LPWSTR)lpExistingFileName, NeededSize, > lpNtLinkTarget, &lpFilePart) && > - (*lpNtLinkTarget) != L'\0') > + if (hTarget != INVALID_HANDLE_VALUE) > { > - UNICODE_STRING CheckDrive, LinkDrive; > - WCHAR wCheckDrive[10]; > + NtClose(hTarget); > + } > > - swprintf(wCheckDrive, L"\\??\\%c:", (WCHAR)(*lpNtLinkTarget)); > - RtlInitUnicodeString(&CheckDrive, wCheckDrive); > + if (LinkName.Buffer) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkName.Buffer); > + } > > - RtlZeroMemory(&LinkDrive, sizeof(UNICODE_STRING)); > + if (LinkInformation) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); > + } > + } > + _SEH2_END; > > - LinkDrive.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, (MAX_PATH + 1) * sizeof(WCHAR)); > - if(LinkDrive.Buffer != NULL) > - { > - HANDLE hFile, hTarget; > - OBJECT_ATTRIBUTES ObjectAttributes; > - > - InitializeObjectAttributes(&ObjectAttributes, > - &CheckDrive, > - OBJ_CASE_INSENSITIVE, > - NULL, > - NULL); > - > - Status = NtOpenSymbolicLinkObject(&hFile, 1, > &ObjectAttributes); > - if(NT_SUCCESS(Status)) > - { > - UNICODE_STRING LanManager; > - > - RtlInitUnicodeString(&LanManager, > L"\\Device\\LanmanRedirector\\"); > - > - NtQuerySymbolicLinkObject(hFile, &LinkDrive, NULL); > - > - if(!RtlPrefixUnicodeString(&LanManager, &LinkDrive, TRUE)) > - { > - InitializeObjectAttributes(&ObjectAttributes, > - &LinkTarget, > - OBJ_CASE_INSENSITIVE, > - NULL, > - lpSecurityDescriptor); > - Status = NtOpenFile(&hTarget, > - SYNCHRONIZE | DELETE, > - &ObjectAttributes, > - &IoStatus, > - FILE_SHARE_READ | FILE_SHARE_WRITE | > FILE_SHARE_DELETE, > - FILE_SYNCHRONOUS_IO_NONALERT | > FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); > - if(NT_SUCCESS(Status)) > - { > - if(RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, > NULL, NULL)) > - { > - NeededSize = sizeof(FILE_LINK_INFORMATION) + > LinkName.Length + sizeof(WCHAR); > - LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, NeededSize); > - if(LinkInformation != NULL) > - { > - LinkInformation->ReplaceIfExists = FALSE; > - LinkInformation->RootDirectory = 0; > - LinkInformation->FileNameLength = LinkName.Length; > - RtlCopyMemory(LinkInformation->FileName, > LinkName.Buffer, LinkName.Length); > - > - Status = NtSetInformationFile(hTarget, &IoStatus, > LinkInformation, NeededSize, FileLinkInformation); > - if(NT_SUCCESS(Status)) > - { > - Ret = TRUE; > - } > - else > - { > - BaseSetLastNTError(Status); > - } > - > - RtlFreeHeap(RtlGetProcessHeap(), 0, > LinkInformation); > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_PATH_NOT_FOUND); > - } > - NtClose(hTarget); > - } > - else > - { > - WARN("Unable to open link destination \"%wZ\"!\n", > &LinkTarget); > - BaseSetLastNTError(Status); > - } > - } > - else > - { > - WARN("Path \"%wZ\" must not be a mapped drive!\n", > &LinkDrive); > - SetLastError(ERROR_INVALID_NAME); > - } > - > - NtClose(hFile); > - } > - else > - { > - BaseSetLastNTError(Status); > - } > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_INVALID_NAME); > - } > - RtlFreeHeap(RtlGetProcessHeap(), 0, lpNtLinkTarget); > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_INVALID_NAME); > - } > - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); > - } > - else > - { > - SetLastError(ERROR_PATH_NOT_FOUND); > - } > - > - return Ret; > + return Ret; > } > - > > /* > * @implemented > @@ -199,26 +139,32 @@ > LPCSTR lpExistingFileName, > LPSECURITY_ATTRIBUTES lpSecurityAttributes) > { > - PWCHAR FileNameW, ExistingFileNameW; > - BOOL Ret; > + BOOL Ret; > + PUNICODE_STRING lpFileNameW; > + UNICODE_STRING ExistingFileNameW; > > - if(!lpFileName || !lpExistingFileName) > - { > - SetLastError(ERROR_INVALID_PARAMETER); > - return FALSE; > - } > + lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); > + if (!lpFileNameW) > + { > + return FALSE; > + } > > - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) > - return FALSE; > + if (!lpExistingFileName) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > > - if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, TRUE))) > - return FALSE; > + if (!Basep8BitStringToDynamicUnicodeString(&ExistingFileNameW, > lpExistingFileName)) > + { > + return FALSE; > + } > > - Ret = CreateHardLinkW(FileNameW , ExistingFileNameW , > lpSecurityAttributes); > + Ret = CreateHardLinkW(lpFileNameW->Buffer, ExistingFileNameW.Buffer, > lpSecurityAttributes); > > - RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW); > + RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW.Buffer); > > - return Ret; > + return Ret; > } > > /* EOF */ > > >

1 0

Problem with new BE release candidate
by caemyr＠myopera.com 22 Sep '11

22 Sep '11

Windows cmake builder is running new BE since yesterday. First thing that i noticed, is the increase of buildtime. Previous version was consistent around 5 minutes, the new candidate - more than 7. I doublechecked it by swapping BE's back and forth. This might look not serious, but if this problem scales up, we are talking about 35 minutes of buildtime for someone who needed 25 minutes previously. -- With best regards Caemyr

1 0

[ros-diffs] [gadamopoulos] 52716: [win32k] - Fix TrackMouseEvent. Now hot tracking really works
by James Tabor 20 Sep '11

20 Sep '11

If it passes all the wine tests w/o the intermittent hits and misses! SYNC it to HEAD!

1 1

Re: [ros-dev] [ros-diffs] [dgorbachev] 53730: [CMAKE] Allow to specify prefix/suffix for GCC and Binutils.
by Jérôme Gardou 20 Sep '11

20 Sep '11

Hello. May I ask why you removed the -nodefaultlibs flag? Regards. Jérôme. Le 18/09/2011 02:57, dgorbachev(a)svn.reactos.org a écrit : > Author: dgorbachev > Date: Sun Sep 18 00:57:17 2011 > New Revision: 53730 > > URL: http://svn.reactos.org/svn/reactos?rev=53730&view=rev > Log: > [CMAKE] > Allow to specify prefix/suffix for GCC and Binutils. > > Modified: > trunk/reactos/cmake/gcc.cmake > trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt > trunk/reactos/lib/sdk/crt/oldnames.cmake > trunk/reactos/toolchain-gcc.cmake > > Modified: trunk/reactos/cmake/gcc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53730&… > ============================================================================== > --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -86,7 +86,7 @@ > > set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o<TARGET> <LINK_LIBRARIES>") > > -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import -Wl,--disable-stdcall-fixup") > +set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") > > set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") > > @@ -134,7 +134,7 @@ > endif() > > if(${TYPE} STREQUAL kernelmodedriver) > - add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000") > + add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000") > endif() > endfunction() > > @@ -190,25 +190,25 @@ > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) > > # Delayed importlib creation > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) > > elseif(${_extension} STREQUAL ".def") > message("Use of def files for import libs is deprecated: ${_exports_file}") > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) > else() > message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") > @@ -243,7 +243,7 @@ > endfunction() > > macro(macro_mc FILE) > - set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) > + set(COMMAND_MC ${CMAKE_MC_COMPILER} -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) > endmacro() > > #pseh lib, needed with mingw > > Modified: trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -65,8 +65,7 @@ > if(NOT MSVC) > add_custom_command( > OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > > set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) > > > Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -1,8 +1,7 @@ > if(NOT MSVC) > add_custom_command( > OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > > set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) > > > Modified: trunk/reactos/toolchain-gcc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53… > ============================================================================== > --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) > +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -3,19 +3,25 @@ > set(ARCH i386) > endif() > > -# Choose the right MinGW prefix > -if(ARCH MATCHES i386) > +# Choose the right MinGW toolchain prefix > +if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX) > + if(ARCH MATCHES i386) > > - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > - set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") > - else() > - set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") > - endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > + set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") > + else() > + set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") > + endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > > -elseif(ARCH MATCHES amd64) > - set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") > -elseif(ARCH MATCHES arm) > - set(MINGW_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Prefix") > + elseif(ARCH MATCHES amd64) > + set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix") > + elseif(ARCH MATCHES arm) > + set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix") > + endif() > +endif() > + > +if (NOT DEFINED MINGW_TOOLCHAIN_SUFFIX) > + set(MINGW_TOOLCHAIN_SUFFIX "" CACHE STRING "MinGW Toolchain Suffix") > endif() > > if(ENABLE_CCACHE) > @@ -28,11 +34,13 @@ > set(CMAKE_SYSTEM_NAME Windows) > set(CMAKE_SYSTEM_PROCESSOR i686) > > -# Which compilers to use for C and C++ > -set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) > -set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) > -set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) > -set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) > +# Which tools to use > +set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) > +set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) > +set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) > > if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs<TARGET> <LINK_FLAGS> <OBJECTS>") > @@ -46,4 +54,4 @@ > #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) > set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") > > -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") > +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") > >

2 1

Re: [ros-dev] [ros-diffs] [rmessiant] 53729: [NTOSKRNL] Disable normal APC delivery while acquiring/releasing a heap lock. Also, BOOLEAN != NTSTATUS.
by Timo Kreuzer 19 Sep '11

19 Sep '11

Am 17.09.2011 22:26, schrieb rmessiant(a)svn.reactos.org: > Author: rmessiant > Date: Sat Sep 17 20:26:31 2011 > New Revision: 53729 > > URL: http://svn.reactos.org/svn/reactos?rev=53729&view=rev > Log: > [NTOSKRNL] > Disable normal APC delivery while acquiring/releasing a heap lock. Also, BOOLEAN != NTSTATUS. > > > Modified: > trunk/reactos/ntoskrnl/rtl/libsupp.c > > 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 [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sat Sep 17 20:26:31 2011 > @@ -168,7 +168,10 @@ > RtlEnterHeapLock( > PHEAP_LOCK Lock) > { > - return ExAcquireResourceExclusive(&Lock->Resource, TRUE); > + KeEnterCriticalRegion(); > + ExAcquireResourceExclusive(&Lock->Resource, TRUE); > + KeLeaveCriticalRegion(); > + return STATUS_SUCCESS; > } > > NTSTATUS > @@ -185,7 +188,9 @@ > RtlLeaveHeapLock( > PHEAP_LOCK Lock) > { > + KeEnterCriticalRegion(); > ExReleaseResource(&Lock->Resource); > + KeLeaveCriticalRegion(); > return STATUS_SUCCESS; > } > Why enable APC delivery after the resource is acquired? It should stay disabled to prevent deadlocks.

3 2

IServ secured access
by Pierre Schweitzer 18 Sep '11

18 Sep '11

Hi, small note to inform people who were having issues connecting to secured IServ services due to wrong SSL certificate (issued for the wrong address) that the certificate has been renewed today and the issues are gone. Regards, Pierre

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev