Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[ros-arm-bringup] 34206: - Fix the ARM build after the commit by hpoussin which had broken it (with a good change, nonetheless).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:50:42 2008 New Revision: 34206 URL: http://svn.reactos.org/svn/reactos?rev=34206&view=rev Log: - Fix the ARM build after the commit by hpoussin which had broken it (with a good change, nonetheless). Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=342… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Jun 29 21:50:42 2008 @@ -68,7 +68,6 @@ <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> <linkerflag>-s</linkerflag> - <linkerflag>-lgcc</linkerflag> <linkerflag>-static</linkerflag> <directory name="media">

16 years, 2 months

[ros-arm-bringup] 34205: - Plug in RAM Disk boot support in the loader.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:47:14 2008 New Revision: 34205 URL: http://svn.reactos.org/svn/reactos?rev=34205&view=rev Log: - Plug in RAM Disk boot support in the loader. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Sun Jun 29 21:47:14 2008 @@ -1461,6 +1461,22 @@ ArmLoaderBlock->Thread = ArmLoaderBlock->Process + sizeof(EPROCESS); // + // Check if we're booting from RAM disk + // + if ((gRamDiskBase) && (gRamDiskSize)) + { + // + // Allocate a descriptor to describe it + // + Status = ArmCreateMemoryDescriptor(LoaderXIPRom, + (ULONG_PTR)gRamDiskBase >> PAGE_SHIFT, + gRamDiskSize / PAGE_SIZE, + 0, + &Dummy); + if (Status != STATUS_SUCCESS) return; + } + + // // Loop memory list // NextEntry = ArmLoaderBlock->MemoryDescriptorListHead.Flink;

16 years, 2 months

[ros-arm-bringup] 34204: - Add RAM disk support to FreeLDR and to the NTLDR emulation layer in the kernel for non-clean archs (ppc and x86)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:42:12 2008 New Revision: 34204 URL: http://svn.reactos.org/svn/reactos?rev=34204&view=rev Log: - Add RAM disk support to FreeLDR and to the NTLDR emulation layer in the kernel for non-clean archs (ppc and x86) Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/include/reactos/rosldr.h trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sun Jun 29 21:42:12 2008 @@ -601,6 +601,8 @@ LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; + LoaderBlock.RdAddr = (ULONG)gRamDiskBase; + LoaderBlock.RdLength = gRamDiskSize; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rosldr.h [iso-8859-1] Sun Jun 29 21:42:12 2008 @@ -35,6 +35,8 @@ UCHAR Syms[12]; ULONG MmapLength; ULONG MmapAddr; + ULONG RdLength; + ULONG RdAddr; ULONG DrivesCount; PARC_DISK_SIGNATURE DrivesAddr; ULONG ConfigTable; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Sun Jun 29 21:42:12 2008 @@ -1148,6 +1148,21 @@ KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd), 0, &Base); + + // + // Check if we have a ramdisk + // + if ((RosLoaderBlock->RdAddr) && (RosLoaderBlock->RdLength)) + { + // + // Build a descriptor for it + // + KiRosAllocateNtDescriptor(LoaderXIPRom, + KERNEL_DESCRIPTOR_PAGE(RosLoaderBlock->RdAddr), + (RosLoaderBlock->RdLength + PAGE_SIZE - 1) >> PAGE_SHIFT, + 0, + &Base); + } /* Setup command line */ LoaderBlock->LoadOptions = BldrCommandLine;

16 years, 2 months

[ros-arm-bringup] 34203: - Call IopStartRamdisk if booting from one. This completes kernel-side RAM disk boot support

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:18:04 2008 New Revision: 34203 URL: http://svn.reactos.org/svn/reactos?rev=34203&view=rev Log: - Call IopStartRamdisk if booting from one. This completes kernel-side RAM disk boot support Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun Jun 29 21:18:04 2008 @@ -512,6 +512,13 @@ IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> PhysicalDeviceObject, BusRelations); + + /* Check if this was a ramdisk boot */ + if (RtlEqualMemory(LoaderBlock->ArcBootDeviceName, "ramdisk(0)", 10)) + { + /* Initialize the ramdisk driver */ + IopStartRamdisk(LoaderBlock); + } /* Create ARC names for boot devices */ IopCreateArcNames(LoaderBlock);

16 years, 2 months

[ros-arm-bringup] 34202: - Plug in RAM disk boot support (kernel-side)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:15:48 2008 New Revision: 34202 URL: http://svn.reactos.org/svn/reactos?rev=34202&view=rev Log: - Plug in RAM disk boot support (kernel-side) Added: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Jun 29 21:15:48 2008 @@ -55,6 +55,30 @@ // Returns the type of METHOD_ used in this IOCTL // #define IO_METHOD_FROM_CTL_CODE(c) (c & 0x00000003) + +// +// Bugcheck codes for RAM disk booting +// +// +// No LoaderXIPRom descriptor was found in the loader memory list +// +#define RD_NO_XIPROM_DESCRIPTOR 1 +// +// Unable to open the RAM disk driver (ramdisk.sys or \Device\Ramdisk) +// +#define RD_NO_RAMDISK_DRIVER 2 +// +// FSCTL_CREATE_RAM_DISK failed +// +#define RD_FSCTL_FAILED 3 +// +// Unable to create GUID string from binary GUID +// +#define RD_GUID_CONVERT_FAILED 4 +// +// Unable to create symbolic link pointing to the RAM disk device +// +#define RD_SYMLINK_CREATE_FAILED 5 // // Packet Types when piggybacking on the IRP Overlay @@ -987,6 +1011,15 @@ ); // +// Ramdisk Routines +// +NTSTATUS +NTAPI +IopStartRamdisk( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +// // Global I/O Data // extern POBJECT_TYPE IoCompletionType; Added: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ramdisk.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c (added) +++ trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] Sun Jun 29 21:15:48 2008 @@ -1,0 +1,255 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/io/iomgr/ramdisk.c + * PURPOSE: Allows booting from RAM disk + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#include <initguid.h> +#include <ntddrdsk.h> +#define NDEBUG +#include <debug.h> + +/* DATA ***********************************************************************/ + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, IopStartRamdisk) +#endif + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor; + NTSTATUS Status; + PCHAR CommandLine, Offset, OffsetValue, Length, LengthValue; + HANDLE DriverHandle; + RAMDISK_CREATE_INPUT RamdiskCreate; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING GuidString, SymbolicLinkName, ObjectName, DeviceString; + PLIST_ENTRY ListHead, NextEntry; + OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR SourceString[54]; + + // + // Scan memory descriptors + // + MemoryDescriptor = NULL; + ListHead = &LoaderBlock->MemoryDescriptorListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + // + // Get the descriptor + // + MemoryDescriptor = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + // + // Needs to be a ROM/RAM descriptor + // + if (MemoryDescriptor->MemoryType == LoaderXIPRom) break; + + // + // Keep trying + // + NextEntry = NextEntry->Flink; + } + + // + // Nothing found? + // + if (NextEntry == ListHead) + { + // + // Bugcheck -- no data + // + KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED, + RD_NO_XIPROM_DESCRIPTOR, + STATUS_INVALID_PARAMETER, + 0, + 0); + } + + // + // Setup the input buffer + // + RtlZeroMemory(&RamdiskCreate, sizeof(RamdiskCreate)); + RamdiskCreate.Version = sizeof(RamdiskCreate); + RamdiskCreate.DiskType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; + RamdiskCreate.BasePage = MemoryDescriptor->BasePage; + RamdiskCreate.DiskOffset = 0; + RamdiskCreate.DiskLength = MemoryDescriptor->PageCount << PAGE_SHIFT; + RamdiskCreate.DiskGuid = RAMDISK_BOOTDISK_GUID; + RamdiskCreate.DriveLetter = L'C'; + RamdiskCreate.Options.Fixed = TRUE; + + // + // Check for commandline parameters + // + CommandLine = LoaderBlock->LoadOptions; + if (CommandLine) + { + // + // Make everything upper case + // + _strupr(CommandLine); + + // + // Check for offset parameter + // + Offset = strstr(CommandLine, "RDIMAGEOFFSET"); + if (Offset) + { + // + // Get to the actual value + // + OffsetValue = strstr(Offset, "="); + if (OffsetValue) + { + // + // Set the offset + // + RamdiskCreate.DiskOffset = atol(OffsetValue + 1); + } + } + + // + // Reduce the disk length + // + RamdiskCreate.DiskLength -= RamdiskCreate.DiskOffset; + + // + // Check for length parameter + // + Length = strstr(CommandLine, "RDIMAGELENGTH"); + if (Length) + { + // + // Get to the actual value + // + LengthValue = strstr(Length, "="); + if (LengthValue) + { + // + // Set the offset + // + RamdiskCreate.DiskLength = _atoi64(LengthValue + 1); + } + } + } + + // + // Setup object attributes + // + RtlInitUnicodeString(&ObjectName, L"\\Device\\Ramdisk"); + InitializeObjectAttributes(&ObjectAttributes, + &ObjectName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + // + // Open a handle to the driver + // + Status = ZwOpenFile(&DriverHandle, + GENERIC_ALL, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(IoStatusBlock.Status))) + { + // + // Bugcheck -- no driver + // + KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED, + RD_NO_RAMDISK_DRIVER, + IoStatusBlock.Status, + 0, + 0); + } + + // + // Send create command + // + Status = ZwDeviceIoControlFile(DriverHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_CREATE_RAM_DISK, + &RamdiskCreate, + sizeof(RamdiskCreate), + NULL, + 0); + ZwClose(DriverHandle); + if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(IoStatusBlock.Status))) + { + // + // Bugcheck -- driver failed + // + KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED, + RD_FSCTL_FAILED, + IoStatusBlock.Status, + 0, + 0); + } + + // + // Convert the GUID + // + Status = RtlStringFromGUID(&RamdiskCreate.DiskGuid, &GuidString); + if (!NT_SUCCESS(Status)) + { + // + // Bugcheck -- GUID convert failed + // + KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED, + RD_GUID_CONVERT_FAILED, + Status, + 0, + 0); + } + + // + // Build the symbolic link name and target + // + _snwprintf(SourceString, + sizeof(SourceString), + L"\\Device\\Ramdisk%wZ", + &GuidString); + SymbolicLinkName.Length = 38; + SymbolicLinkName.MaximumLength = 38 + sizeof(UNICODE_NULL); + SymbolicLinkName.Buffer = L"\\ArcName\\ramdisk(0)"; + + // + // Create the symbolic link + // + RtlInitUnicodeString(&DeviceString, SourceString); + Status = IoCreateSymbolicLink(&SymbolicLinkName, &DeviceString); + RtlFreeUnicodeString(&GuidString); + if (!NT_SUCCESS(Status)) + { + // + // Bugcheck -- symlink create failed + // + KeBugCheckEx(RAMDISK_BOOT_INITIALIZATION_FAILED, + RD_SYMLINK_CREATE_FAILED, + Status, + 0, + 0); + } + + // + // We made it + // + return STATUS_SUCCESS; +} Propchange: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 29 21:15:48 2008 @@ -256,6 +256,7 @@ <file>iowork.c</file> <file>irp.c</file> <file>irq.c</file> + <file>ramdisk.c</file> <file>rawfs.c</file> <file>remlock.c</file> <file>util.c</file>

16 years, 2 months

[ros-arm-bringup] 34201: - Define NT RAM Disk device interface (100% compatible with Microsoft ramdisk.sys)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:13:53 2008 New Revision: 34201 URL: http://svn.reactos.org/svn/reactos?rev=34201&view=rev Log: - Define NT RAM Disk device interface (100% compatible with Microsoft ramdisk.sys) Added: trunk/reactos/include/reactos/drivers/ntddrdsk.h (with props) Added: trunk/reactos/include/reactos/drivers/ntddrdsk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/nt… ============================================================================== --- trunk/reactos/include/reactos/drivers/ntddrdsk.h (added) +++ trunk/reactos/include/reactos/drivers/ntddrdsk.h [iso-8859-1] Sun Jun 29 21:13:53 2008 @@ -1,0 +1,84 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/ntddrdsk.h + * PURPOSE: Constants and types for accessing the RAM disk device + * PROGRAMMERS: ReactOS Portable Systems Group + */ +#ifndef _NTDDRDSK_H_ +#define _NTDDRDSK_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#ifdef __cplusplus1 +extern "C" { +#endif + +// +// This guid identifies a RAM disk volume +// +DEFINE_GUID(RAMDISK_BOOTDISK_GUID, 0xd9b257fc, 0x684e, 0x4dcb, 0x79, 0xab, 0xf6, 0xa2, 0xcf, 0x03, 0x50, 0xb7); + +// +// Device Name - this string is the name of the device. It is the name +// that should be passed to NtOpenFile when accessing the device. +// +// Note: For devices that support multiple units, it should be suffixed +// with the Ascii representation of the unit number. +// +#define DD_RAMDISK_DEVICE_NAME "\\Device\\Ramdisk" + +// +// IoControlCode values for ramdisk devices. +// +#define IOCTL_RAMDISK_BASE FILE_DEVICE_VIRTUAL_DISK +#define FSCTL_CREATE_RAM_DISK CTL_CODE(FILE_DEVICE_VIRTUAL_DISK, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) + +// +// Options when creating a ramdisk +// +typedef struct _RAMDISK_CREATE_OPTIONS +{ + ULONG Readonly:1; + ULONG Fixed:1; + ULONG NoDriveLetter:1; + ULONG NoDosDevice:1; + ULONG Hidden:1; + ULONG ExportAsCd:1; +} RAMDISK_CREATE_OPTIONS; + +// +// This structure is passed in for a FSCTL_CREATE_RAM_DISK call +// +typedef struct _RAMDISK_CREATE_INPUT +{ + ULONG Version; + GUID DiskGuid; + ULONG DiskType; + RAMDISK_CREATE_OPTIONS Options; + ULONGLONG DiskLength; + ULONG DiskOffset; + union + { + struct + { + ULONG ViewCount; + ULONG ViewLength; + WCHAR FileName[ANYSIZE_ARRAY]; + }; + struct + { + ULONG BasePage; + WCHAR DriveLetter; + }; + PVOID BaseAddress; + }; +} RAMDISK_CREATE_INPUT, *PRAMDISK_CREATE_INPUT; + +#ifdef __cplusplus +} +#endif + +#endif // _NTDDRDSK_H_ Propchange: trunk/reactos/include/reactos/drivers/ntddrdsk.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/drivers/ntddrdsk.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

16 years, 2 months

[ros-arm-bringup] 34200: - Add RAMDISK_BOOT_INITIALIZATION_FAILED bugcheck code

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:11:46 2008 New Revision: 34200 URL: http://svn.reactos.org/svn/reactos?rev=34200&view=rev Log: - Add RAMDISK_BOOT_INITIALIZATION_FAILED bugcheck code Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sun Jun 29 21:11:46 2008 @@ -1436,6 +1436,14 @@ CRITICAL_OBJECT_TERMINATION . +MessageId=0xF8 +Severity=Success +Facility=System +SymbolicName=RAMDISK_BOOT_INITIALIZATION_FAILED +Language=English +An initialization failure occurred while attempting to boot from the RAM disk. +. + MessageId=0xFC Severity=Success Facility=System

16 years, 2 months

[ros-arm-bringup] 34199: atoi64 is available without MSVCRT, through ntdll or ntos

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 29 21:10:41 2008 New Revision: 34199 URL: http://svn.reactos.org/svn/reactos?rev=34199&view=rev Log: atoi64 is available without MSVCRT, through ntdll or ntos Modified: trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Jun 29 21:10:41 2008 @@ -420,8 +420,9 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ltow (long, wchar_t*, int); _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ultow (unsigned long, wchar_t*, int); +_CRTIMP __int64 __cdecl __MINGW_NOTHROW _atoi64(const char *); + #ifdef __MSVCRT__ -_CRTIMP __int64 __cdecl __MINGW_NOTHROW _atoi64(const char *); _CRTIMP char* __cdecl __MINGW_NOTHROW _i64toa(__int64, char *, int); _CRTIMP char* __cdecl __MINGW_NOTHROW _ui64toa(unsigned __int64, char *, int); _CRTIMP __int64 __cdecl __MINGW_NOTHROW _wtoi64(const wchar_t *);

16 years, 2 months

[jimtabor] 34198: Add and fix path calls. This allows more drawing tests (Area.exe by Yian)to pass based on observation.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 29 19:47:58 2008 New Revision: 34198 URL: http://svn.reactos.org/svn/reactos?rev=34198&view=rev Log: Add and fix path calls. This allows more drawing tests (Area.exe by Yian)to pass based on observation. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun Jun 29 19:47:58 2008 @@ -76,10 +76,7 @@ UnsafePoints[CurrentPoint].x += dc->ptlDCOrig.x; UnsafePoints[CurrentPoint].y += dc->ptlDCOrig.y; } - - if (PATH_IsPathOpen(dc->DcLevel)) - ret = PATH_Polygon(dc, UnsafePoints, Count ); - else + // No need to have path here. { DestRect.left = UnsafePoints[0].x; DestRect.right = UnsafePoints[0].x; @@ -157,6 +154,8 @@ LPINT PolyCounts, int Count) { + if (PATH_IsPathOpen(dc->DcLevel)) + return PATH_PolyPolygon ( dc, Points, PolyCounts, Count); while (--Count >=0) { if (!IntGdiPolygon ( dc, Points, *PolyCounts )) @@ -225,15 +224,6 @@ if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) return TRUE; - if (nRightRect < nLeftRect) - { - INT tmp = nRightRect; nRightRect = nLeftRect; nLeftRect = tmp; - } - if (nBottomRect < nTopRect) - { - INT tmp = nBottomRect; nBottomRect = nTopRect; nTopRect = tmp; - } - /* * Get pointers to all necessary GDI objects. */ @@ -244,11 +234,28 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ return TRUE; + } + + if (PATH_IsPathOpen(dc->DcLevel)) + { + ret = PATH_Ellipse(dc, nLeftRect, nTopRect, nRightRect, nBottomRect); + DC_UnlockDc(dc); + return ret; + } + + if (nRightRect < nLeftRect) + { + INT tmp = nRightRect; nRightRect = nLeftRect; nLeftRect = tmp; + } + if (nBottomRect < nTopRect) + { + INT tmp = nBottomRect; nBottomRect = nTopRect; nTopRect = tmp; } Dc_Attr = dc->pDc_Attr; Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sun Jun 29 19:47:58 2008 @@ -102,17 +102,15 @@ if (PATH_IsPathOpen(dc->DcLevel)) { Ret = PATH_LineTo(dc, XEnd, YEnd); -//#if 0 if (Ret) { - // FIXME - PATH_LineTo should maybe do this... + // FIXME - PATH_LineTo should maybe do this? No Dc_Attr->ptlCurrent.x = XEnd; Dc_Attr->ptlCurrent.y = YEnd; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } -//#endif return Ret; } else @@ -361,6 +359,9 @@ BOOL ret = FALSE; // default to failure pts = pt; pc = PolyPoints; + + if (PATH_IsPathOpen(dc->DcLevel)) + return PATH_PolyPolyline( dc, pt, PolyPoints, Count ); for (i = 0; i < Count; i++) {

16 years, 2 months

[cfinck] 34197: Tag the ReactOS 0.3.5 Release

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jun 29 19:42:09 2008 New Revision: 34197 URL: http://svn.reactos.org/svn/reactos?rev=34197&view=rev Log: Tag the ReactOS 0.3.5 Release Added: tags/ReactOS-0.3.5/ - copied from r34196, branches/ros-branch-0_3_5/ Removed: branches/ros-branch-0_3_5/

16 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008