Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[cgutman] 47057: [NTOSKRNL] - Rewrite IoOpenDeviceInterfaceRegistryKey using the same helper function that is used in IoGetDeviceInterfaces and IoSetDeviceInterfaceState to reduce complexity and chance of bugs (tested and confirmed working) - Revert r46748 - Fixes bug #5321 (AC97)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Apr 29 03:44:20 2010 New Revision: 47057 URL: http://svn.reactos.org/svn/reactos?rev=47057&view=rev Log: [NTOSKRNL] - Rewrite IoOpenDeviceInterfaceRegistryKey using the same helper function that is used in IoGetDeviceInterfaces and IoSetDeviceInterfaceState to reduce complexity and chance of bugs (tested and confirmed working) - Revert r46748 - Fixes bug #5321 (AC97) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Thu Apr 29 03:44:20 2010 @@ -224,159 +224,37 @@ IN ACCESS_MASK DesiredAccess, OUT PHANDLE DeviceInterfaceKey) { - WCHAR StrBuff[MAX_PATH], PathBuff[MAX_PATH]; - PWCHAR Guid, RefString; - UNICODE_STRING DevParamU = RTL_CONSTANT_STRING(L"\\Device Parameters"); - UNICODE_STRING PrefixU = RTL_CONSTANT_STRING(L"\\??\\"); - UNICODE_STRING KeyPath, KeyName; - UNICODE_STRING MatchableGuid; - UNICODE_STRING GuidString; - HANDLE GuidKey, hInterfaceKey; - ULONG Index = 0; - PKEY_BASIC_INFORMATION KeyInformation; - ULONG KeyInformationLength; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - ULONG RequiredLength; - - swprintf(StrBuff, L"##?#%s", &SymbolicLinkName->Buffer[PrefixU.Length / sizeof(WCHAR)]); - - RefString = wcsstr(StrBuff, L"\\"); - if (RefString) - { - RefString[0] = 0; - } - - RtlInitUnicodeString(&MatchableGuid, StrBuff); - - Guid = wcsstr(StrBuff, L"{"); - if (!Guid) - return STATUS_OBJECT_NAME_NOT_FOUND; - - KeyPath.Buffer = PathBuff; - KeyPath.Length = 0; - KeyPath.MaximumLength = MAX_PATH * sizeof(WCHAR); - - GuidString.Buffer = Guid; - GuidString.Length = GuidString.MaximumLength = 38 * sizeof(WCHAR); - - RtlAppendUnicodeToString(&KeyPath, BaseKeyString); - RtlAppendUnicodeStringToString(&KeyPath, &GuidString); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyPath, - OBJ_CASE_INSENSITIVE, - 0, - NULL); - - Status = ZwOpenKey(&GuidKey, KEY_CREATE_SUB_KEY, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - while (TRUE) - { - Status = ZwEnumerateKey(GuidKey, - Index, - KeyBasicInformation, - NULL, - 0, - &RequiredLength); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - KeyInformationLength = RequiredLength; - KeyInformation = ExAllocatePool(PagedPool, KeyInformationLength); - if (!KeyInformation) - { - ZwClose(GuidKey); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ZwEnumerateKey(GuidKey, - Index, - KeyBasicInformation, - KeyInformation, - KeyInformationLength, - &RequiredLength); - } - else - { - ZwClose(GuidKey); - return STATUS_OBJECT_PATH_NOT_FOUND; - } - Index++; - - if (!NT_SUCCESS(Status)) - { - ZwClose(GuidKey); - return Status; - } - - KeyName.Length = KeyName.MaximumLength = KeyInformation->NameLength; - KeyName.Buffer = KeyInformation->Name; - - if (!RtlEqualUnicodeString(&KeyName, &MatchableGuid, TRUE)) - { - ExFreePool(KeyInformation); - continue; - } - - KeyPath.Length = 0; - RtlAppendUnicodeStringToString(&KeyPath, &KeyName); - RtlAppendUnicodeToString(&KeyPath, L"\\"); - - /* check for presence of a reference string */ - if (RefString) - { - /* append reference string */ - RefString[0] = L'#'; - RtlInitUnicodeString(&KeyName, RefString); - } - else - { - /* no reference string */ - RtlInitUnicodeString(&KeyName, L"#"); - } - RtlAppendUnicodeStringToString(&KeyPath, &KeyName); - - /* initialize reference string attributes */ - InitializeObjectAttributes(&ObjectAttributes, - &KeyPath, - OBJ_CASE_INSENSITIVE, - GuidKey, - NULL); - - /* now open device interface key */ - Status = ZwOpenKey(&hInterfaceKey, KEY_CREATE_SUB_KEY, &ObjectAttributes); - - if (NT_SUCCESS(Status)) - { - /* check if it provides a DeviceParameters key */ - InitializeObjectAttributes(&ObjectAttributes, &DevParamU, OBJ_CASE_INSENSITIVE, hInterfaceKey, NULL); - - Status = ZwCreateKey(DeviceInterfaceKey, DesiredAccess, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); - - if (NT_SUCCESS(Status)) - { - /* DeviceParameters key present */ - ZwClose(hInterfaceKey); - } - else - { - /* fall back to device interface */ - *DeviceInterfaceKey = hInterfaceKey; - Status = STATUS_SUCCESS; - } - } - - /* close class key */ - ZwClose(GuidKey); - ExFreePool(KeyInformation); - return Status; - } - - return STATUS_OBJECT_PATH_NOT_FOUND; + HANDLE InstanceKey, DeviceParametersKey; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceParametersU = RTL_CONSTANT_STRING(L"Device Parameters"); + + Status = OpenRegistryHandlesFromSymbolicLink(SymbolicLinkName, + KEY_CREATE_SUB_KEY, + NULL, + NULL, + &InstanceKey); + if (!NT_SUCCESS(Status)) + return Status; + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceParametersU, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + InstanceKey, + NULL); + Status = ZwCreateKey(&DeviceParametersKey, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + ZwClose(InstanceKey); + + if (NT_SUCCESS(Status)) + *DeviceInterfaceKey = DeviceParametersKey; + + return Status; } /*++ @@ -881,6 +759,12 @@ DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); goto cleanup; } + /* RtlAppendUnicodeStringToString added a NULL at the end of the + * destination string, but didn't increase the Length field. + * Do it for it. + */ + ReturnBuffer.Length += sizeof(WCHAR); + NextReferenceString: ExFreePool(ReferenceBi); ReferenceBi = NULL;

14 years, 7 months

[cgutman] 47056: [NTOSKRNL] - Fix length calculation of symbolic links with reference strings attached - Fixes opening registry keys for symbolic links with reference strings (such as audio devices)

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 28 22:06:28 2010 New Revision: 47056 URL: http://svn.reactos.org/svn/reactos?rev=47056&view=rev Log: [NTOSKRNL] - Fix length calculation of symbolic links with reference strings attached - Fixes opening registry keys for symbolic links with reference strings (such as audio devices) Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Wed Apr 28 22:06:28 2010 @@ -127,7 +127,7 @@ { ReferenceString.Buffer[0] = L'#'; - SubKeyName.Length = ReferenceString.Buffer - SubKeyName.Buffer; + SubKeyName.Length = (USHORT)((ULONG_PTR)(ReferenceString.Buffer) - (ULONG_PTR)SubKeyName.Buffer); ReferenceString.Length = SymbolicLinkName->Length - SubKeyName.Length; } else

14 years, 7 months

[spetreolle] 47055: Hardcode GeckoCabDir to C:\ReactOS. the mshtml installer now wants a REG_SZ string for it, which excludes using %SystemRoot%. Fixes bootcdregtest.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Apr 28 21:15:17 2010 New Revision: 47055 URL: http://svn.reactos.org/svn/reactos?rev=47055&view=rev Log: Hardcode GeckoCabDir to C:\ReactOS. the mshtml installer now wants a REG_SZ string for it, which excludes using %SystemRoot%. Fixes bootcdregtest. Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Apr 28 21:15:17 2010 @@ -1530,7 +1530,8 @@ ; Internet Explorer HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" -HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +;HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +HKCU,Software\Wine\MSHTML,"GeckoCabDir",,"C:\ReactOS\" ; Sound Schemes HKCU,"AppEvents",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Apr 28 21:15:17 2010 @@ -1712,7 +1712,8 @@ ; Internet Explorer HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" -HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +;HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" +HKCU,Software\Wine\MSHTML,"GeckoCabDir",,"C:\ReactOS\" ; Sound Schemes HKCU,"AppEvents",,0x00000012

14 years, 7 months

[khornicek] 47054: [WIN32K] - Bring support from RLE compressed bitmaps from trunk. - Merge the 4bpp and 8bpp decompress functions to one generic function to avoid code duplication and to reduce code complexity. - Fixes missing icons in Wordpad toolbars, missing reactos logo bitmap in shell about dialog and more.

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Apr 28 14:39:22 2010 New Revision: 47054 URL: http://svn.reactos.org/svn/reactos?rev=47054&view=rev Log: [WIN32K] - Bring support from RLE compressed bitmaps from trunk. - Merge the 4bpp and 8bpp decompress functions to one generic function to avoid code duplication and to reduce code complexity. - Fixes missing icons in Wordpad toolbars, missing reactos logo bitmap in shell about dialog and more. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Wed Apr 28 14:39:22 2010 @@ -13,6 +13,13 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +enum Rle_EscapeCodes +{ + RLE_EOL = 0, /* End of line */ + RLE_END = 1, /* End of bitmap */ + RLE_DELTA = 2 /* Delta */ +}; ULONG NTAPI @@ -118,6 +125,83 @@ return ((bmWidth * bpp + 15) & ~15) >> 3; } +VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format) +{ + INT x = 0; + INT y = Size.cy - 1; + INT c; + INT length; + INT width; + INT height = Size.cy - 1; + BYTE *begin = CompressedBits; + BYTE *bits = CompressedBits; + BYTE *temp; + INT shift; + + switch (Format) + { + case BMF_4RLE: + shift = 1; + break; + case BMF_8RLE: + shift = 0; + break; + default: + DPRINT1("Unsupported RLE format 0x%x\n", Format); + return; + } + + width = ((Size.cx + shift) >> shift); + + while (y >= 0) + { + length = (*bits++) >> shift; + if (length) + { + c = *bits++; + while (length--) + { + if (x >= width) break; + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + else + { + length = *bits++; + switch (length) + { + case RLE_EOL: + x = 0; + y--; + break; + case RLE_END: + return; + case RLE_DELTA: + x += (*bits++) >> shift; + y -= (*bits++) >> shift; + break; + default: + length = length >> shift; + while (length--) + { + c = *bits++; + if (x < width) + { + temp = UncompressedBits + (((height - y) * Delta) + x); + x++; + *temp = c; + } + } + if ((bits - begin) & 1) + { + bits++; + } + } + } + } +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -142,16 +226,6 @@ /* Save a handle to it */ hSurface = pSurface->BaseObject.hHmgr; - /* Check the format */ - if (Format == BMF_4RLE || Format == BMF_8RLE) - { - DPRINT1("Bitmaps with format 0x%x aren't supported yet!\n", Format); - - /* Cleanup and exit */ - GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); - return 0; - } - /* Initialize SURFOBJ */ pSurfObj = &pSurface->SurfObj; @@ -160,32 +234,57 @@ pSurfObj->iType = STYPE_BITMAP; pSurfObj->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); - /* Calculate byte width automatically if it was not provided */ - if (Width == 0) - Width = BITMAP_GetWidthBytes(Size.cx, BitsPerFormat(Format)); - - pSurfObj->lDelta = abs(Width); - pSurfObj->cjBits = pSurfObj->lDelta * Size.cy; - - if (!Bits) - { - /* Allocate memory for bitmap bits */ - pSurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, - pSurfObj->cjBits, - TAG_DIB); - if (!pSurfObj->pvBits) + /* Check the format */ + if (Format == BMF_4RLE || Format == BMF_8RLE) + { + PVOID UncompressedBits; + pSurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); + pSurfObj->cjBits = pSurfObj->lDelta * Size.cy; + + UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pSurfObj->cjBits, TAG_DIB); + if(!UncompressedBits) { /* Cleanup and exit */ GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); return 0; } - + if(Bits) + { + DecompressBitmap(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pSurfObj->lDelta, Format); + } + pSurfObj->pvBits = UncompressedBits; + Format = (Format == BMF_4RLE)? BMF_4BPP : BMF_8BPP; /* Indicate we allocated memory ourselves */ pSurface->ulFlags |= SRF_BITSALLOCD; } else { - pSurfObj->pvBits = Bits; + /* Calculate byte width automatically if it was not provided */ + if (Width == 0) + Width = BITMAP_GetWidthBytes(Size.cx, BitsPerFormat(Format)); + pSurfObj->lDelta = abs(Width); + pSurfObj->cjBits = pSurfObj->lDelta * Size.cy; + + if (!Bits) + { + /* Allocate memory for bitmap bits */ + pSurfObj->pvBits = EngAllocMem(0 != (Flags & BMF_NOZEROINIT) ? 0 : FL_ZERO_MEMORY, + pSurfObj->cjBits, + TAG_DIB); + if (!pSurfObj->pvBits) + { + /* Cleanup and exit */ + GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); + return 0; + } + + /* Indicate we allocated memory ourselves */ + pSurface->ulFlags |= SRF_BITSALLOCD; + } + else + { + pSurfObj->pvBits = Bits; + } } pSurfObj->pvScan0 = pSurfObj->pvBits;

14 years, 8 months

[ekohl] 47053: [MKHIVE/USETUP] - Fix buffer size calculation for the parser. - Do not try to execute an empty registry instruction Patches by Roel Messiant. - Stop the parser at the first NULL character. Patch by me.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Apr 28 13:35:34 2010 New Revision: 47053 URL: http://svn.reactos.org/svn/reactos?rev=47053&view=rev Log: [MKHIVE/USETUP] - Fix buffer size calculation for the parser. - Do not try to execute an empty registry instruction Patches by Roel Messiant. - Stop the parser at the first NULL character. Patch by me. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/lib/newinflib/infcore.c trunk/reactos/lib/newinflib/infrosgen.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Apr 28 13:35:34 2010 @@ -3266,6 +3266,8 @@ DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); + if (Action == NULL) break; // Hackfix + if (!_wcsicmp (Action, L"AddReg")) { Delete = FALSE; Modified: trunk/reactos/lib/newinflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infcore.c?re… ============================================================================== --- trunk/reactos/lib/newinflib/infcore.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infcore.c [iso-8859-1] Wed Apr 28 13:35:34 2010 @@ -365,7 +365,7 @@ /* check if the pointer points to an end of file */ __inline static int is_eof( struct parser *parser, const WCHAR *ptr ) { - return (ptr >= parser->end || *ptr == CONTROL_Z); + return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == 0); } @@ -375,7 +375,8 @@ return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n' || - (*ptr == '\r' && *(ptr + 1) == '\n')); + (*ptr == '\r' && *(ptr + 1) == '\n') || + *ptr == 0); } Modified: trunk/reactos/lib/newinflib/infrosgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/infrosgen.c?… ============================================================================== --- trunk/reactos/lib/newinflib/infrosgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/infrosgen.c [iso-8859-1] Wed Apr 28 13:35:34 2010 @@ -120,7 +120,7 @@ Status = InfpParseBuffer(Cache, new_buff, - new_buff + len, + new_buff + len / sizeof(WCHAR), ErrorLine); FREE(new_buff); } @@ -293,7 +293,7 @@ Status = InfpParseBuffer(Cache, new_buff, - new_buff + len, + new_buff + len / sizeof(WCHAR), ErrorLine); FREE(new_buff); }

14 years, 8 months

[cgutman] 47052: [FREELDR] - Remove the useless function MachDiskNormalizeSystemPath - Rewrite DiskGetBootPath to be much less hacky (but still not hack free) - Freeloader doesn't have to be installed on multi(0)disk(0)rdisk(0)partition(1) (IDE primary master) anymore :) - Freeloader successfully booted ROS after loading itself from multi(0)disk(0)rdisk(1)partition(1)

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 28 05:07:21 2010 New Revision: 47052 URL: http://svn.reactos.org/svn/reactos?rev=47052&view=rev Log: [FREELDR] - Remove the useless function MachDiskNormalizeSystemPath - Rewrite DiskGetBootPath to be much less hacky (but still not hack free) - Freeloader doesn't have to be installed on multi(0)disk(0)rdisk(0)partition(1) (IDE primary master) anymore :) - Freeloader successfully booted ROS after loading itself from multi(0)disk(0)rdisk(1)partition(1) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -45,7 +45,6 @@ MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -48,7 +48,6 @@ MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; - MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -44,12 +44,6 @@ return; } - if (!MachDiskNormalizeSystemPath(FileName, sizeof(FileName))) - { - UiMessageBox("Invalid path to boot sector file"); - return; - } - FilePointer = FsOpenFile(FileName); if (!FilePointer) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -440,7 +440,6 @@ MachVtbl.GetMemoryMap = PpcGetMemoryMap; - MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; MachVtbl.DiskReadLogicalSectors = PpcDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -107,61 +107,79 @@ { static char Path[] = "multi(0)disk(0)"; char Device[4]; - - _itoa(BootDrive, Device, 10); - if (Size <= sizeof(Path) + 6 + strlen(Device)) + char Partition[4]; + PARTITION_TABLE_ENTRY PartitionEntry; + MASTER_BOOT_RECORD MasterBootRecord; + + if (BootDrive < 0x80) { - return FALSE; + /* This is a floppy */ + + if (Size <= sizeof(Path) + 7 + strlen(Device)) + { + return FALSE; + } + + strcpy(BootPath, Path); + + strcat(BootPath, "fdisk"); + + _itoa(BootDrive, Device, 10); + strcat(BootPath, "("); + strcat(BootPath, Device); + strcat(BootPath, ")"); } - strcpy(BootPath, Path); - strcat(BootPath, BootDrive < 0x80 ? "fdisk" : "cdrom"); - strcat(strcat(strcat(BootPath, "("), Device), ")"); - - if (strcmp(BootPath, "multi(0)disk(0)cdrom(128)") == 0) - strcpy(BootPath, "multi(0)disk(0)rdisk(0)partition(1)"); + /* FIXME */ + else if (DiskReadBootRecord(BootDrive, 0, &MasterBootRecord)) + { + /* This is a hard disk */ + + if (!DiskGetActivePartitionEntry(BootDrive, &PartitionEntry, &BootPartition)) + { + DbgPrint("Invalid active partition information\n"); + return FALSE; + } + + if (Size <= sizeof(Path) + 18 + strlen(Device) + strlen(Partition)) + { + return FALSE; + } + + strcpy(BootPath, Path); + + strcat(BootPath, "rdisk"); + + _itoa(BootDrive - 0x80, Device, 10); + strcat(BootPath, "("); + strcat(BootPath, Device); + strcat(BootPath, ")"); + + _itoa(BootPartition, Partition, 10); + strcat(BootPath, "partition("); + strcat(BootPath, Partition); + strcat(BootPath, ")"); + } + else + { + /* This is a CD-ROM drive */ + + if (Size <= sizeof(Path) + 7 + strlen(Device)) + { + return FALSE; + } + + strcpy(BootPath, Path); + + strcat(BootPath, "cdrom"); + + _itoa(BootDrive - 0x80, Device, 10); + strcat(BootPath, "("); + strcat(BootPath, Device); + strcat(BootPath, ")"); + } + return TRUE; } - -BOOLEAN -DiskNormalizeSystemPath(char *SystemPath, unsigned Size) -{ - CHAR BootPath[256]; - ULONG PartitionNumber; - ULONG DriveNumber; - PARTITION_TABLE_ENTRY PartEntry; - char *p; - - if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) - { - return FALSE; - } - - if (0 != PartitionNumber || DriveNumber < 0x80) - { - return TRUE; - } - - if (! DiskGetActivePartitionEntry(DriveNumber, - &PartEntry, - &PartitionNumber) || - PartitionNumber < 1 || 9 < PartitionNumber) - { - return FALSE; - } - - p = SystemPath; - while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { - p++; - } - p = strchr(p, ')'); - if (NULL == p || '0' != *(p - 1)) { - return FALSE; - } - *(p - 1) = '0' + PartitionNumber; - - return TRUE; -} - // This function is in arch/i386/i386disk.c //VOID DiskStopFloppyMotor(VOID) Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -197,7 +197,6 @@ BOOLEAN DiskReadBootRecord(ULONG DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord) { - char ErrMsg[64]; ULONG Index; // Read master boot record @@ -231,9 +230,6 @@ // Check the partition table magic value if (BootRecord->MasterBootRecordMagic != 0xaa55) { - sprintf(ErrMsg, "Invalid partition table magic 0x%x found on drive 0x%lx", - BootRecord->MasterBootRecordMagic, DriveNumber); - DiskError(ErrMsg, 0); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -127,7 +127,6 @@ extern ULONG BootPartition; BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); -BOOLEAN DiskNormalizeSystemPath(char *SystemPath, unsigned Size); /////////////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -62,7 +62,6 @@ ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); - BOOLEAN (*DiskNormalizeSystemPath)(char *SystemPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG (*DiskGetCacheableBlockCount)(ULONG DriveNumber); Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -97,13 +97,6 @@ goto LinuxBootFailed; } - // Open the boot volume - if (!MachDiskNormalizeSystemPath(LinuxBootPath, sizeof(LinuxBootPath))) - { - UiMessageBox("Invalid boot path"); - goto LinuxBootFailed; - } - // Open the kernel LinuxKernel = FsOpenFile(LinuxKernelName); if (!LinuxKernel) Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -37,7 +37,6 @@ #undef MachBeep #undef MachPrepareForReactOS #undef MachDiskGetBootPath -#undef MachDiskNormalizeSystemPath #undef MachDiskReadLogicalSectors #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount @@ -153,12 +152,6 @@ } BOOLEAN -MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size) -{ - return MachVtbl.DiskNormalizeSystemPath(SystemPath, Size); -} - -BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) { return MachVtbl.DiskReadLogicalSectors(DriveNumber, SectorNumber, SectorCount, Buffer); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] Wed Apr 28 05:07:21 2010 @@ -69,7 +69,7 @@ * multi(0)disk(0)cdrom(x)\path */ p = p + 6; - *BootDrive = atoi(p); + *BootDrive = atoi(p) + 0x80; p = strchr(p, ')'); if (p == NULL) return FALSE; 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] Wed Apr 28 05:07:21 2010 @@ -718,12 +718,6 @@ } else { - if (! MachDiskNormalizeSystemPath(SystemPath, - sizeof(SystemPath))) - { - UiMessageBox("Invalid system path"); - return; - } /* copy system path into kernel command line */ strcpy(reactos_kernel_cmdline, SystemPath); }

14 years, 8 months

[cgutman] 47051: [FREELDR] - Set the partition count to 0 for a floppy drive so it can be told apart from a cd-rom drive - Add a last-chance sector size detection algorithm based on the partition number - Add the same detection code to the xbox code too (it is essentially the same as what was already there just with more comments) - Change DiskNormalizeSystemPath so it doesn't try to "normalize" a floppy boot path - Fixes bug #5233

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 28 00:12:11 2010 New Revision: 47051 URL: http://svn.reactos.org/svn/reactos?rev=47051&view=rev Log: [FREELDR] - Set the partition count to 0 for a floppy drive so it can be told apart from a cd-rom drive - Add a last-chance sector size detection algorithm based on the partition number - Add the same detection code to the xbox code too (it is essentially the same as what was already there just with more comments) - Change DiskNormalizeSystemPath so it doesn't try to "normalize" a floppy boot path - Fixes bug #5233 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/reactos/arcname.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] Wed Apr 28 00:12:11 2010 @@ -452,7 +452,23 @@ SectorCount = Geometry.Sectors; } else - return EINVAL; + { + DPRINTM(DPRINT_HWDETECT, "Using legacy sector size detection\n"); + + /* Fall back to legacy detection */ + 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) { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Wed Apr 28 00:12:11 2010 @@ -138,7 +138,20 @@ if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) return EINVAL; - SectorSize = (DrivePartition == 0xff ? 2048 : 512); + + 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 (!XboxDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Wed Apr 28 00:12:11 2010 @@ -136,7 +136,7 @@ return FALSE; } - if (0 != PartitionNumber) + if (0 != PartitionNumber || DriveNumber < 0x80) { return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] Wed Apr 28 00:12:11 2010 @@ -60,7 +60,7 @@ if (p == NULL) return FALSE; p++; - *BootPartition = 0xff; + *BootPartition = 0; } else if (_strnicmp(p, "cdrom(", 6) == 0) {

14 years, 8 months

[ekohl] 47050: [MKHIVE] - Add RegDeleteKeyW stub. - Implement RegDeleteKeyA so that it calls RegDeleteKeyW.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Apr 27 23:47:54 2010 New Revision: 47050 URL: http://svn.reactos.org/svn/reactos?rev=47050&view=rev Log: [MKHIVE] - Add RegDeleteKeyW stub. - Implement RegDeleteKeyA so that it calls RegDeleteKeyW. Modified: trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Tue Apr 27 23:47:54 2010 @@ -25,9 +25,9 @@ /* * TODO: - * - Implement RegDeleteKey() + * - Implement RegDeleteKeyW() * - Implement RegEnumValue() - * - Implement RegQueryValueExA() + * - Implement RegQueryValueExW() */ #include <stdlib.h> @@ -246,15 +246,38 @@ } LONG WINAPI -RegDeleteKeyA(HKEY Key, - LPCSTR Name) -{ - if (Name != NULL && strchr(Name, '\\') != NULL) - return(ERROR_INVALID_PARAMETER); - - DPRINT1("FIXME!\n"); - - return(ERROR_SUCCESS); +RegDeleteKeyW( + IN HKEY hKey, + IN LPCWSTR lpSubKey) +{ + DPRINT1("FIXME!\n"); + return ERROR_SUCCESS; +} + +LONG WINAPI +RegDeleteKeyA( + IN HKEY hKey, + IN LPCSTR lpSubKey) +{ + PWSTR lpSubKeyW = NULL; + LONG rc; + + if (lpSubKey != NULL && strchr(lpSubKey, '\\') != NULL) + return ERROR_INVALID_PARAMETER; + + if (lpSubKey) + { + lpSubKeyW = MultiByteToWideChar(lpSubKey); + if (!lpSubKeyW) + return ERROR_OUTOFMEMORY; + } + + rc = RegDeleteKeyW(hKey, lpSubKeyW); + + if (lpSubKey) + free(lpSubKeyW); + + return rc; } LONG WINAPI

14 years, 8 months

[mjmartin] 47049: [ntoskrnl/io] - Check for null pointers before attempting to copy or free memory.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Apr 27 15:41:37 2010 New Revision: 47049 URL: http://svn.reactos.org/svn/reactos?rev=47049&view=rev Log: [ntoskrnl/io] - Check for null pointers before attempting to copy or free memory. Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Apr 27 15:41:37 2010 @@ -884,7 +884,8 @@ NextReferenceString: ExFreePool(ReferenceBi); ReferenceBi = NULL; - ExFreePool(bip); + if (bip) + ExFreePool(bip); bip = NULL; if (ReferenceKey != INVALID_HANDLE_VALUE) { @@ -921,8 +922,11 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); - ExFreePool(ReturnBuffer.Buffer); + if (ReturnBuffer.Buffer) + { + RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); + ExFreePool(ReturnBuffer.Buffer); + } ReturnBuffer.Buffer = NewBuffer; } ReturnBuffer.Buffer[ReturnBuffer.Length / sizeof(WCHAR)] = UNICODE_NULL;

14 years, 8 months

[mjmartin] 47048: [ntoskrnl\mm] - Fix a continuous loop bug in MiWriteProtectSystemImage.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Apr 27 15:35:52 2010 New Revision: 47048 URL: http://svn.reactos.org/svn/reactos?rev=47048&view=rev Log: [ntoskrnl\mm] - Fix a continuous loop bug in MiWriteProtectSystemImage. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Tue Apr 27 15:35:52 2010 @@ -2154,6 +2154,10 @@ { /* Same protection, so merge the request */ CurrentAddress = BaseAddress + Size - 1; + + /* Next */ + Sections--; + Section++; continue; }

14 years, 8 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 April 2010