Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[fireball] 43479: - Fix inverted if condition in TEB initialization, spotted by Stefan.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 15 18:47:26 2009 New Revision: 43479 URL: http://svn.reactos.org/svn/reactos?rev=43479&view=rev Log: - Fix inverted if condition in TEB initialization, spotted by Stefan. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 18:47:26 2009 @@ -655,21 +655,21 @@ (InitialTeb->PreviousStackLimit == NULL)) { // - // Use grandparent TEB values - // - Teb->Tib.StackBase = InitialTeb->PreviousStackBase; - Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; - } - else - { - // // Use initial TEB values // Teb->Tib.StackBase = InitialTeb->StackBase; Teb->Tib.StackLimit = InitialTeb->StackLimit; Teb->DeallocationStack = InitialTeb->AllocatedStackBase; } - + else + { + // + // Use grandparent TEB values + // + Teb->Tib.StackBase = InitialTeb->PreviousStackBase; + Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; + } + // // Initialize the static unicode string //

14 years, 11 months

[gschneider] 43478: Remove duplicate libjpeg from rosapps, used one is in trunk

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Oct 15 17:19:58 2009 New Revision: 43478 URL: http://svn.reactos.org/svn/reactos?rev=43478&view=rev Log: Remove duplicate libjpeg from rosapps, used one is in trunk Removed: trunk/rosapps/lib/libjpeg/ Modified: trunk/rosapps/lib/directory.rbuild Modified: trunk/rosapps/lib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=4… ============================================================================== --- trunk/rosapps/lib/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/lib/directory.rbuild [iso-8859-1] Thu Oct 15 17:19:58 2009 @@ -1,11 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  <directory name="libpng"> <xi:include href="libpng/libpng.rbuild" /> </directory>

14 years, 11 months

[fireball] 43477: [fastfat_new] - Add a helper function for reading (mapping) volume's stream file object. - Read a boot sector during volume mounting, unpack it and store values in Vcb->Bpb for later usage. In particular, a volume's serial number being empty problem is fixed now. Volume label is still empty. - Silence more non-important debug prints.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 15 12:50:12 2009 New Revision: 43477 URL: http://svn.reactos.org/svn/reactos?rev=43477&view=rev Log: [fastfat_new] - Add a helper function for reading (mapping) volume's stream file object. - Read a boot sector during volume mounting, unpack it and store values in Vcb->Bpb for later usage. In particular, a volume's serial number being empty problem is fixed now. Volume label is still empty. - Silence more non-important debug prints. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -49,6 +49,13 @@ NTSTATUS NTAPI FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +VOID NTAPI +FatReadStreamFile(PVCB Vcb, + ULONGLONG ByteOffset, + ULONG ByteSize, + PBCB *Bcb, + PVOID *Buffer); /* ------------------------------------------------------ blockdev.c */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -502,7 +502,7 @@ RtlDowncaseUnicodeString(UnicodeName, UnicodeName, FALSE); RtlUpcaseUnicodeString(UnicodeName, UnicodeName, FALSE); - DPRINT1("Converted long name: %wZ\n", UnicodeName); + DPRINT("Converted long name: %wZ\n", UnicodeName); /* Add the long unicode name link */ FatInsertName(IrpContext, &Fcb->ParentFcb->Dcb.SplayLinksUnicode, &Fcb->LongName); @@ -603,7 +603,7 @@ /* Set the length */ OutString->Length = BaseLen + ExtLen; - DPRINT1("'%s', len %d\n", OutString->Buffer, OutString->Length); + DPRINT("'%s', len %d\n", OutString->Buffer, OutString->Length); } VOID Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -47,6 +47,37 @@ ExReleaseResourceLite(&FatGlobalData.Resource); } +VOID +NTAPI +FatiUnpackBpb(PBIOS_PARAMETER_BLOCK Bpb, PPACKED_BIOS_PARAMETER_BLOCK PackedBpb) +{ + CopyUchar2(&Bpb->BytesPerSector, &PackedBpb->BytesPerSector[0]); + CopyUchar1(&Bpb->SectorsPerCluster, &PackedBpb->SectorsPerCluster[0]); + CopyUchar2(&Bpb->ReservedSectors, &PackedBpb->ReservedSectors[0]); + CopyUchar1(&Bpb->Fats, &PackedBpb->Fats[0]); + CopyUchar2(&Bpb->RootEntries, &PackedBpb->RootEntries[0]); + CopyUchar2(&Bpb->Sectors, &PackedBpb->Sectors[0]); + CopyUchar1(&Bpb->Media, &PackedBpb->Media[0]); + CopyUchar2(&Bpb->SectorsPerFat, &PackedBpb->SectorsPerFat[0]); + CopyUchar2(&Bpb->SectorsPerTrack, &PackedBpb->SectorsPerTrack[0]); + CopyUchar2(&Bpb->Heads, &PackedBpb->Heads[0]); + CopyUchar4(&Bpb->HiddenSectors, &PackedBpb->HiddenSectors[0]); + CopyUchar4(&Bpb->LargeSectors, &PackedBpb->LargeSectors[0]); + CopyUchar4(&Bpb->LargeSectorsPerFat, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->LargeSectorsPerFat[0]); + CopyUchar2(&Bpb->ExtendedFlags, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->ExtendedFlags[0]); + CopyUchar2(&Bpb->FsVersion, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->FsVersion[0]); + CopyUchar4(&Bpb->RootDirFirstCluster,&((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->RootDirFirstCluster[0]); + CopyUchar2(&Bpb->FsInfoSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->FsInfoSector[0]); + CopyUchar2(&Bpb->BackupBootSector, &((PPACKED_BIOS_PARAMETER_BLOCK_EX)PackedBpb)->BackupBootSector[0]); +} + +BOOLEAN +NTAPI +FatiBpbFat32(PPACKED_BIOS_PARAMETER_BLOCK PackedBpb) +{ + return (*(USHORT *)(&PackedBpb->SectorsPerFat) == 0); +} + NTSTATUS NTAPI FatMountVolume(PFAT_IRP_CONTEXT IrpContext, @@ -60,6 +91,8 @@ PVOLUME_DEVICE_OBJECT VolumeDevice; VCB *Vcb; FF_ERROR Error; + PBCB BootBcb; + PPACKED_BOOT_SECTOR BootSector; DPRINT1("FatMountVolume()\n"); @@ -167,7 +200,46 @@ goto FatMountVolumeCleanup; } - // TODO: Read BPB and store it in Vcb->Bpb + /* Read the boot sector */ + FatReadStreamFile(Vcb, 0, sizeof(PACKED_BOOT_SECTOR), &BootBcb, (PVOID)&BootSector); + + /* Check if it's successful */ + if (!BootBcb) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatMountVolumeCleanup; + } + + /* Unpack data */ + FatiUnpackBpb(&Vcb->Bpb, &BootSector->PackedBpb); + + /* Verify if sector size matches */ + if (DiskGeometry.BytesPerSector != Vcb->Bpb.BytesPerSector) + { + DPRINT1("Disk geometry BPS %d and bios BPS %d don't match!\n", + DiskGeometry.BytesPerSector, Vcb->Bpb.BytesPerSector); + + /* Fail */ + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatMountVolumeCleanup; + } + + /* If Sectors value is set, discard the LargeSectors value */ + if (Vcb->Bpb.Sectors) Vcb->Bpb.LargeSectors = 0; + + /* Copy serial number */ + if (FatiBpbFat32(&BootSector->PackedBpb)) + { + CopyUchar4(&Vpb->SerialNumber, ((PPACKED_BOOT_SECTOR_EX)BootSector)->Id); + } + else + { + /* This is FAT12/16 */ + CopyUchar4(&Vpb->SerialNumber, BootSector->Id); + } + + /* Unpin the BCB */ + CcUnpinData(BootBcb); /* Create root DCB for it */ FatCreateRootDcb(IrpContext, &VolumeDevice->Vcb); @@ -249,7 +321,7 @@ PFAT_IRP_CONTEXT IrpContext; BOOLEAN CanWait = TRUE; - DPRINT1("FatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT("FatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); /* Get CanWait flag */ if (IoGetCurrentIrpStackLocation(Irp)->FileObject) Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Thu Oct 15 12:50:12 2009 @@ -171,4 +171,27 @@ return STATUS_NOT_IMPLEMENTED; } +VOID +NTAPI +FatReadStreamFile(PVCB Vcb, + ULONGLONG ByteOffset, + ULONG ByteSize, + PBCB *Bcb, + PVOID *Buffer) +{ + LARGE_INTEGER Offset; + + Offset.QuadPart = ByteOffset; + + if (!CcMapData(Vcb->StreamFileObject, + &Offset, + ByteSize, + TRUE, // FIXME: CanWait + Bcb, + Buffer)) + { + ASSERT(FALSE); + } +} + /* EOF */

14 years, 11 months

[ros-arm-bringup] 43476: - Multiple PEB/TEB creation fixes: - Set up PEB and TEB under SEH to handle possible paging errors (which are legitimate). - Also touch the image under SEH to handle image paging errors (also legitimate). - Should avoid kernel panics in cases where the executable is damaged, invalid, or impossible to page in. - Initialize more PEB fields. - Add new INITIAL_PEB structure to support fork() in the future. Also fixes the fact we don't create a PEB for the system process anym

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

Author: ros-arm-bringup Date: Thu Oct 15 07:56:41 2009 New Revision: 43476 URL: http://svn.reactos.org/svn/reactos?rev=43476&view=rev Log: - Multiple PEB/TEB creation fixes: - Set up PEB and TEB under SEH to handle possible paging errors (which are legitimate). - Also touch the image under SEH to handle image paging errors (also legitimate). - Should avoid kernel panics in cases where the executable is damaged, invalid, or impossible to page in. - Initialize more PEB fields. - Add new INITIAL_PEB structure to support fork() in the future. Also fixes the fact we don't create a PEB for the system process anymore. - Create PEB while attached to the process. - Handle UP-only images, and set correct affinity mask in the PEB. - Set session ID instead of session structure (currently zero). - Set correct TIB version in the TEB. Due to a historical oddity, the NT TIB identifies itself as '0x1e00', which is 30 shifted 8 bits. 30 is the version identifier of OS/2 3.0, the original 32-bit target of the Windows NT effort. - Handle initial TEB correctly for fork(). - Move AWE APIs to procsup.c instea of section.c since they are unrelated. - Move the rewritten PEB/TEB functions to ARM3's procsup.c. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -587,23 +587,53 @@ } PEB_FREE_BLOCK, *PPEB_FREE_BLOCK; // +// Initial PEB +// +typedef struct _INITIAL_PEB +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + union + { + BOOLEAN BitField; +#if (NTDDI_VERSION >= NTDDI_WS03) + struct + { + BOOLEAN ImageUsesLargePages:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + BOOLEAN IsProtectedProcess:1; + BOOLEAN IsLegacyProcess:1; + BOOLEAN SpareBits:5; +#else + BOOLEAN SpareBits:7; +#endif + }; +#else + BOOLEAN SpareBool; +#endif + }; + HANDLE Mutant; +} INITIAL_PEB, *PINITIAL_PEB; + +// // Process Environment Block (PEB) // typedef struct _PEB { - UCHAR InheritedAddressSpace; - UCHAR ReadImageFileExecOptions; - UCHAR BeingDebugged; + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; #if (NTDDI_VERSION >= NTDDI_WS03) struct { - UCHAR ImageUsesLargePages:1; + BOOLEAN ImageUsesLargePages:1; #if (NTDDI_VERSION >= NTDDI_LONGHORN) - UCHAR IsProtectedProcess:1; - UCHAR IsLegacyProcess:1; - UCHAR SpareBits:5; + BOOLEAN IsProtectedProcess:1; + BOOLEAN IsLegacyProcess:1; + BOOLEAN SpareBits:5; #else - UCHAR SpareBits:7; + BOOLEAN SpareBits:7; #endif }; #else Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -776,14 +776,19 @@ NTSTATUS NTAPI -MmCreatePeb(struct _EPROCESS *Process); - -PTEB +MmCreatePeb( + IN PEPROCESS Process, + IN PINITIAL_PEB InitialPeb, + OUT PPEB *BasePeb +); + +NTSTATUS NTAPI MmCreateTeb( - struct _EPROCESS *Process, - PCLIENT_ID ClientId, - PINITIAL_TEB InitialTeb + IN PEPROCESS Process, + IN PCLIENT_ID ClientId, + IN PINITIAL_TEB InitialTeb, + OUT PTEB* BaseTeb ); VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -28,6 +28,10 @@ #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 + +#define MM_HIGHEST_VAD_ADDRESS \ + (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) + // // FIXFIX: These should go in ex.h after the pool merge Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -16,6 +16,13 @@ #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" +extern MM_SYSTEMSIZE MmSystemSize; + +PVOID +NTAPI +MiCreatePebOrTeb(PEPROCESS Process, + PVOID BaseAddress); + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -278,4 +285,454 @@ return MmGrowKernelStackEx(StackPointer, KERNEL_LARGE_STACK_COMMIT); } +NTSTATUS +NTAPI +MmSetMemoryPriorityProcess(IN PEPROCESS Process, + IN UCHAR MemoryPriority) +{ + UCHAR OldPriority; + + // + // Check if we have less then 16MB of Physical Memory + // + if ((MmSystemSize == MmSmallSystem) && + (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) + { + // + // Always use background priority + // + MemoryPriority = MEMORY_PRIORITY_BACKGROUND; + } + + // + // Save the old priority and update it + // + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; + Process->Vm.Flags.MemoryPriority = MemoryPriority; + + // + // Return the old priority + // + return OldPriority; +} + +LCID +NTAPI +MmGetSessionLocaleId(VOID) +{ + PEPROCESS Process; + PAGED_CODE(); + + // + // Get the current process + // + Process = PsGetCurrentProcess(); + + // + // Check if it's the Session Leader + // + if (Process->Vm.Flags.SessionLeader) + { + // + // Make sure it has a valid Session + // + if (Process->Session) + { + // + // Get the Locale ID + // +#if ROS_HAS_SESSIONS + return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; +#endif + } + } + + // + // Not a session leader, return the default + // + return PsDefaultThreadLocaleId; +} + +NTSTATUS +NTAPI +MmCreatePeb(IN PEPROCESS Process, + IN PINITIAL_PEB InitialPeb, + OUT PPEB *BasePeb) +{ + PPEB Peb = NULL; + LARGE_INTEGER SectionOffset; + SIZE_T ViewSize = 0; + PVOID TableBase = NULL; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; + NTSTATUS Status; + USHORT Characteristics; + KAFFINITY ProcessAffinityMask = 0; + SectionOffset.QuadPart = (ULONGLONG)0; + *BasePeb = NULL; + + // + // Attach to Process + // + KeAttachProcess(&Process->Pcb); + + // + // Allocate the PEB + // + Peb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + ASSERT(Peb == (PVOID)0x7FFDF000); + + // + // Map NLS Tables + // + Status = MmMapViewOfSection(ExpNlsSectionPointer, + (PEPROCESS)Process, + &TableBase, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_TOP_DOWN, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) return Status; + + // + // Use SEH in case we can't load the PEB + // + _SEH2_TRY + { + // + // Initialize the PEB + // + RtlZeroMemory(Peb, sizeof(PEB)); + + // + // Set up data + // + Peb->ImageBaseAddress = Process->SectionBaseAddress; + Peb->InheritedAddressSpace = InitialPeb->InheritedAddressSpace; + Peb->Mutant = InitialPeb->Mutant; + Peb->ImageUsesLargePages = InitialPeb->ImageUsesLargePages; + + // + // NLS + // + Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; + Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; + Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; + + // + // Default Version Data (could get changed below) + // + Peb->OSMajorVersion = NtMajorVersion; + Peb->OSMinorVersion = NtMinorVersion; + Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); + Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; + + // + // Heap and Debug Data + // + Peb->NumberOfProcessors = KeNumberProcessors; + Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); + Peb->NtGlobalFlag = NtGlobalFlag; + /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; + Peb->HeapSegmentCommit = MmHeapSegmentCommit; + Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; + Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; + Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; + */ + Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); + Peb->ProcessHeaps = (PVOID*)(Peb + 1); + + // + // Session ID + // + if (Process->Session) Peb->SessionId = 0; // MmGetSessionId(Process); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + // + // Use SEH in case we can't load the image + // + _SEH2_TRY + { + // + // Get NT Headers + // + NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress); + Characteristics = NtHeaders->FileHeader.Characteristics; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return STATUS_INVALID_IMAGE_PROTECT); + } + _SEH2_END; + + // + // Parse the headers + // + if (NtHeaders) + { + // + // Use SEH in case we can't load the headers + // + _SEH2_TRY + { + // + // Get the Image Config Data too + // + ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ViewSize); + if (ImageConfigData) + { + // + // Probe it + // + ProbeForRead(ImageConfigData, + sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), + sizeof(ULONG)); + } + + // + // Write subsystem data + // + Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; + Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; + Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; + + // + // Check for version data + // + if (NtHeaders->OptionalHeader.Win32VersionValue) + { + // + // Extract values and write them + // + Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; + Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; + Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; + Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; + } + + // + // Process the image config data overrides if specfied + // + if (ImageConfigData != NULL) + { + // + // Process CSD version override + // + if (ImageConfigData->CSDVersion) + { + // + // Set new data + // + Peb->OSCSDVersion = ImageConfigData->CSDVersion; + } + + // + // Process affinity mask ovverride + // + if (ImageConfigData->ProcessAffinityMask) + { + // + // Set new data + // + ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; + } + } + + // + // Check if this is a UP image + if (Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) + { + // + // Force it to use CPU 0 + // + Peb->ImageProcessAffinityMask = 0; + } + else + { + // + // Whatever was configured + // + Peb->ImageProcessAffinityMask = ProcessAffinityMask; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Fail + // + KeDetachProcess(); + _SEH2_YIELD(return STATUS_INVALID_IMAGE_PROTECT); + } + _SEH2_END; + } + + // + // Detach from the Process + // + KeDetachProcess(); + *BasePeb = Peb; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MmCreateTeb(IN PEPROCESS Process, + IN PCLIENT_ID ClientId, + IN PINITIAL_TEB InitialTeb, + OUT PTEB *BaseTeb) +{ + PTEB Teb; + NTSTATUS Status = STATUS_SUCCESS; + *BaseTeb = NULL; + + // + // Attach to Target + // + KeAttachProcess(&Process->Pcb); + + // + // Allocate the TEB + // + Teb = MiCreatePebOrTeb(Process, + (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); + if (!Teb) return STATUS_INSUFFICIENT_RESOURCES; + + // + // Use SEH in case we can't load the TEB + // + _SEH2_TRY + { + // + // Initialize the PEB + // + RtlZeroMemory(Teb, sizeof(TEB)); + + // + // Set TIB Data + // + Teb->Tib.ExceptionList = EXCEPTION_CHAIN_END; + Teb->Tib.Self = (PNT_TIB)Teb; + + // + // Identify this as an OS/2 V3.0 ("Cruiser") TIB + // + Teb->Tib.Version = 30 << 8; + + // + // Set TEB Data + // + Teb->ClientId = *ClientId; + Teb->RealClientId = *ClientId; + Teb->ProcessEnvironmentBlock = Process->Peb; + Teb->CurrentLocale = PsDefaultThreadLocaleId; + + // + // Check if we have a grandparent TEB + // + if ((InitialTeb->PreviousStackBase == NULL) && + (InitialTeb->PreviousStackLimit == NULL)) + { + // + // Use grandparent TEB values + // + Teb->Tib.StackBase = InitialTeb->PreviousStackBase; + Teb->Tib.StackLimit = InitialTeb->PreviousStackLimit; + } + else + { + // + // Use initial TEB values + // + Teb->Tib.StackBase = InitialTeb->StackBase; + Teb->Tib.StackLimit = InitialTeb->StackLimit; + Teb->DeallocationStack = InitialTeb->AllocatedStackBase; + } + + // + // Initialize the static unicode string + // + Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Get error code + // + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + // + // Return + // + KeDetachProcess(); + *BaseTeb = Teb; + return Status; +} + +/* SYSTEM CALLS ***************************************************************/ + +NTSTATUS +NTAPI +NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtMapUserPhysicalPages(IN PVOID VirtualAddresses, + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtMapUserPhysicalPagesScatter(IN PVOID *VirtualAddresses, + IN ULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtFreeUserPhysicalPages(IN HANDLE ProcessHandle, + IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -13,66 +13,7 @@ #define NDEBUG #include <debug.h> -extern ULONG NtMajorVersion; -extern ULONG NtMinorVersion; -extern ULONG CmNtCSDVersion; -extern ULONG NtBuildNumber; -extern MM_SYSTEMSIZE MmSystemSize; - -#define MM_HIGHEST_VAD_ADDRESS \ - (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) - /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -MmSetMemoryPriorityProcess(IN PEPROCESS Process, - IN UCHAR MemoryPriority) -{ - UCHAR OldPriority; - - /* Check if we have less then 16MB of Physical Memory */ - if ((MmSystemSize == MmSmallSystem) && - (MmStats.NrTotalPages < ((15 * 1024 * 1024) / PAGE_SIZE))) - { - /* Always use background priority */ - MemoryPriority = 0; - } - - /* Save the old priority and update it */ - OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; - Process->Vm.Flags.MemoryPriority = MemoryPriority; - - /* Return the old priority */ - return OldPriority; -} - -LCID -NTAPI -MmGetSessionLocaleId(VOID) -{ - PEPROCESS Process; - PAGED_CODE(); - - /* Get the current process */ - Process = PsGetCurrentProcess(); - - /* Check if it's the Session Leader */ - if (Process->Vm.Flags.SessionLeader) - { - /* Make sure it has a valid Session */ - if (Process->Session) - { - /* Get the Locale ID */ -#if ROS_HAS_SESSIONS - return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; -#endif - } - } - - /* Not a session leader, return the default */ - return PsDefaultThreadLocaleId; -} PVOID NTAPI @@ -146,211 +87,6 @@ /* Unlock the Address Space */ MmUnlockAddressSpace(ProcessAddressSpace); -} - -NTSTATUS -NTAPI -MmCreatePeb(PEPROCESS Process) -{ - PPEB Peb = NULL; - LARGE_INTEGER SectionOffset; - SIZE_T ViewSize = 0; - PVOID TableBase = NULL; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; - NTSTATUS Status; - KAFFINITY ProcessAffinityMask = 0; - SectionOffset.QuadPart = (ULONGLONG)0; - DPRINT("MmCreatePeb\n"); - - /* Allocate the PEB */ - Peb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - ASSERT(Peb == (PVOID)0x7FFDF000); - - /* Map NLS Tables */ - DPRINT("Mapping NLS\n"); - Status = MmMapViewOfSection(ExpNlsSectionPointer, - (PEPROCESS)Process, - &TableBase, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_TOP_DOWN, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); - return(Status); - } - DPRINT("TableBase %p ViewSize %lx\n", TableBase, ViewSize); - - /* Attach to Process */ - KeAttachProcess(&Process->Pcb); - - /* Initialize the PEB */ - DPRINT("Allocated: %x\n", Peb); - RtlZeroMemory(Peb, sizeof(PEB)); - - /* Set up data */ - DPRINT("Setting up PEB\n"); - Peb->ImageBaseAddress = Process->SectionBaseAddress; - Peb->InheritedAddressSpace = 0; - Peb->Mutant = NULL; - - /* NLS */ - Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; - Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; - Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; - - /* Default Version Data (could get changed below) */ - Peb->OSMajorVersion = NtMajorVersion; - Peb->OSMinorVersion = NtMinorVersion; - Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); - Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; - - /* Heap and Debug Data */ - Peb->NumberOfProcessors = KeNumberProcessors; - Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); - Peb->NtGlobalFlag = NtGlobalFlag; - /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; - Peb->HeapSegmentCommit = MmHeapSegmentCommit; - Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ - Peb->NumberOfHeaps = 0; - Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); - Peb->ProcessHeaps = (PVOID*)(Peb + 1); - - /* Image Data */ - if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress))) - { - /* Write subsystem data */ - Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; - Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; - Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; - - /* Write Version Data */ - if (NtHeaders->OptionalHeader.Win32VersionValue) - { - Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; - Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; - Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; - - /* Set the Platform ID */ - Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; - } - - /* Check if the image is not safe for SMP */ - if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) - { - /* FIXME: Choose one randomly */ - Peb->ImageProcessAffinityMask = 1; - } - else - { - /* Use affinity from Image Header */ - Peb->ImageProcessAffinityMask = ProcessAffinityMask; - } - - _SEH2_TRY - { - /* Get the Image Config Data too */ - ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); - - ProbeForRead(ImageConfigData, - sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), - sizeof(ULONG)); - - /* Process the image config data overrides if specfied. */ - if (ImageConfigData != NULL) - { - if (ImageConfigData->CSDVersion) - { - Peb->OSCSDVersion = ImageConfigData->CSDVersion; - } - if (ImageConfigData->ProcessAffinityMask) - { - ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; - } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* Misc data */ - Peb->SessionId = Process->Session; - Process->Peb = Peb; - - /* Detach from the Process */ - KeDetachProcess(); - - DPRINT("MmCreatePeb: Peb created at %p\n", Peb); - return Status; -} - -PTEB -NTAPI -MmCreateTeb(PEPROCESS Process, - PCLIENT_ID ClientId, - PINITIAL_TEB InitialTeb) -{ - PTEB Teb; - BOOLEAN Attached = FALSE; - - /* Attach to the process */ - DPRINT("MmCreateTeb\n"); - if (Process != PsGetCurrentProcess()) - { - /* Attach to Target */ - KeAttachProcess(&Process->Pcb); - Attached = TRUE; - } - - /* Allocate the TEB */ - Teb = MiCreatePebOrTeb(Process, - (PVOID)((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1)); - - /* Initialize the PEB */ - RtlZeroMemory(Teb, sizeof(TEB)); - - /* Set TIB Data */ - Teb->Tib.ExceptionList = (PVOID)0xFFFFFFFF; - Teb->Tib.Version = 1; - Teb->Tib.Self = (PNT_TIB)Teb; - - /* Set TEB Data */ - Teb->ClientId = *ClientId; - Teb->RealClientId = *ClientId; - Teb->ProcessEnvironmentBlock = Process->Peb; - Teb->CurrentLocale = PsDefaultThreadLocaleId; - - /* Store stack information from InitialTeb */ - if(InitialTeb != NULL) - { - Teb->Tib.StackBase = InitialTeb->StackBase; - Teb->Tib.StackLimit = InitialTeb->StackLimit; - Teb->DeallocationStack = InitialTeb->AllocatedStackBase; - } - - /* Initialize the static unicode string */ - Teb->StaticUnicodeString.Length = 0; - Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); - Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; - - /* Return TEB Address */ - DPRINT("Allocated: %x\n", Teb); - if (Attached) KeDetachProcess(); - return Teb; } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -5072,52 +5072,12 @@ NTSTATUS NTAPI -NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) +NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, + IN PVOID File2MappedAsFile) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } -NTSTATUS -NTAPI -NtMapUserPhysicalPages(IN PVOID VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtMapUserPhysicalPagesScatter(IN PVOID *VirtualAddresses, - IN ULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtFreeUserPhysicalPages(IN HANDLE ProcessHandle, - IN OUT PULONG_PTR NumberOfPages, - IN OUT PULONG_PTR UserPfnArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtAreMappedFilesTheSame(IN PVOID File1MappedAsAnImage, - IN PVOID File2MappedAsFile) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -379,6 +379,8 @@ BOOLEAN Result, SdAllocated; PSECURITY_DESCRIPTOR SecurityDescriptor; SECURITY_SUBJECT_CONTEXT SubjectContext; + BOOLEAN NeedsPeb = FALSE; + INITIAL_PEB InitialPeb; PAGED_CODE(); PSTRACE(PS_PROCESS_DEBUG, "ProcessHandle: %p Parent: %p\n", ProcessHandle, ParentProcess); @@ -635,17 +637,27 @@ SeAuditProcessCreationInfo. ImageFileName); if (!NT_SUCCESS(Status)) goto CleanupWithRef; + + // + // We need a PEB + // + NeedsPeb = TRUE; } else if (Parent) { /* Check if this is a child of the system process */ if (Parent != PsInitialSystemProcess) { + // + // We need a PEB + // + NeedsPeb = TRUE; + /* This is a clone! */ ASSERTMSG("No support for cloning yet\n", FALSE); } else - { + { /* This is the initial system process */ Flags &= ~PS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, @@ -702,11 +714,34 @@ } /* Create PEB only for User-Mode Processes */ - if (Parent) - { - /* Create it */ - Status = MmCreatePeb(Process); - if (!NT_SUCCESS(Status)) goto CleanupWithRef; + if ((Parent) && (NeedsPeb)) + { + // + // Set up the initial PEB + // + RtlZeroMemory(&InitialPeb, sizeof(INITIAL_PEB)); + InitialPeb.Mutant = (HANDLE)-1; + InitialPeb.ImageUsesLargePages = 0; // FIXME: Not yet supported + + // + // Create it only if we have an image section + // + if (SectionHandle) + { + // + // Create it + // + Status = MmCreatePeb(Process, &InitialPeb, &Process->Peb); + if (!NT_SUCCESS(Status)) goto CleanupWithRef; + } + else + { + // + // We have to clone it + // + ASSERTMSG("No support for cloning yet\n", FALSE); + } + } /* The process can now be activated */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Thu Oct 15 07:56:41 2009 @@ -310,13 +310,13 @@ if (ThreadContext) { /* User-mode Thread, create Teb */ - TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); - if (!TebBase) + Status = MmCreateTeb(Process, &Thread->Cid, InitialTeb, &TebBase); + if (!NT_SUCCESS(Status)) { /* Failed to create the TEB. Release rundown and dereference */ ExReleaseRundownProtection(&Process->RundownProtect); ObDereferenceObject(Thread); - return STATUS_INSUFFICIENT_RESOURCES; + return Status; } /* Set the Start Addresses */

14 years, 11 months

[jimtabor] 43475: - Revert 43470.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 15 07:23:06 2009 New Revision: 43475 URL: http://svn.reactos.org/svn/reactos?rev=43475&view=rev Log: - Revert 43470. Modified: trunk/reactos/include/psdk/wsahelp.h Modified: trunk/reactos/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wsahelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] Thu Oct 15 07:23:06 2009 @@ -70,7 +70,7 @@ typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); -typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKADDR)(PVOID,PSOCKADDR,PINT); +typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,

14 years, 11 months

[ros-arm-bringup] 43474: - unix is one of many platforms that use LP64, so instead of defining every single possible OS which uses LP64, how about we define the *only* OS that uses LLP64: Win64. - Fixes building on BSD and Solaris.

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

Author: ros-arm-bringup Date: Thu Oct 15 06:34:47 2009 New Revision: 43474 URL: http://svn.reactos.org/svn/reactos?rev=43474&view=rev Log: - unix is one of many platforms that use LP64, so instead of defining every single possible OS which uses LP64, how about we define the *only* OS that uses LLP64: Win64. - Fixes building on BSD and Solaris. Modified: trunk/reactos/tools/rsym/rsym.h Modified: trunk/reactos/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=4347… ============================================================================== --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Thu Oct 15 06:34:47 2009 @@ -45,7 +45,7 @@ typedef unsigned short WORD; typedef unsigned short USHORT; typedef unsigned long long ULONGLONG; -#if defined(__x86_64__) && defined(unix) +#if defined(__x86_64__) && !defined(_WIN64) typedef signed int LONG; typedef unsigned int ULONG; typedef unsigned int DWORD; @@ -57,7 +57,7 @@ #if defined(_WIN64) typedef unsigned __int64 ULONG_PTR; #else -#if defined(__x86_64__) && defined(unix) +#if defined(__x86_64__) && !defined(_WIN64) typedef unsigned int ULONG_PTR; #else typedef unsigned long ULONG_PTR;

14 years, 11 months

[ros-arm-bringup] 43473: - Define KeInitializeSpinLock for ARM to unbreak build.

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

Author: ros-arm-bringup Date: Thu Oct 15 06:24:13 2009 New Revision: 43473 URL: http://svn.reactos.org/svn/reactos?rev=43473&view=rev Log: - Define KeInitializeSpinLock for ARM to unbreak build. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Oct 15 06:24:13 2009 @@ -5674,6 +5674,14 @@ #elif defined(_M_ARM) // !defined (_X86_) + FORCEINLINE + VOID + KeInitializeSpinLock(IN PKSPIN_LOCK SpinLock) + { + /* Clear the lock */ + *SpinLock = 0; + } + NTHALAPI KIRQL FASTCALL

14 years, 11 months

[ros-arm-bringup] 43472: - Add some more PTE field macros for portability. - Define PTE_TOP.

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

Author: ros-arm-bringup Date: Thu Oct 15 06:09:36 2009 New Revision: 43472 URL: http://svn.reactos.org/svn/reactos?rev=43472&view=rev Log: - Add some more PTE field macros for portability. - Define PTE_TOP. Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Thu Oct 15 06:09:36 2009 @@ -175,6 +175,7 @@ #define MiGetPdeOffset(x) (((ULONG)(x)) >> 22) #define PTE_BASE 0xC0000000 +#define PTE_TOP 0xC03FFFFF #define PDE_BASE 0xC1000000 #define HYPER_SPACE 0xC1100000 @@ -203,6 +204,8 @@ #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) +#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Access = 1) // FIXFIX +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ExtendedAccess = 1) // FIXFIX #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Thu Oct 15 06:09:36 2009 @@ -17,6 +17,7 @@ #define PTE_BASE 0xC0000000 #define PDE_BASE 0xC0300000 +#define PTE_TOP 0xC03FFFFF #define HYPER_SPACE 0xC0400000 /* Converting address to a corresponding PDE or PTE entry */ @@ -47,5 +48,7 @@ #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) #define MI_IS_PAGE_DIRTY(x) ((x)->u.Hard.Dirty == 1) +#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Write = 1) #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */

14 years, 11 months

[ros-arm-bringup] 43471: - Remove calls to MmMarkPageMapped/UnMapped -- these APIs don't exist anymore. - Unbreaks part of kernel ARM build.

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

Author: ros-arm-bringup Date: Thu Oct 15 06:03:37 2009 New Revision: 43471 URL: http://svn.reactos.org/svn/reactos?rev=43471&view=rev Log: - Remove calls to MmMarkPageMapped/UnMapped -- these APIs don't exist anymore. - Unbreaks part of kernel ARM build. Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Thu Oct 15 06:03:37 2009 @@ -511,11 +511,6 @@ OldPdeOffset = PdeOffset; // - // Mark it as mapped - // - if (MarkAsMapped) MmMarkPageMapped(*Pages); - - // // Set the PFN // TempPte.u.Hard.PageFrameNumber = *Pages++; @@ -676,7 +671,6 @@ // Unmap the PFN // Pfn = Pte.u.Hard.PageFrameNumber; - if (Pfn) MmMarkPageUnmapped(Pfn); // // Release the PFN if it was ours

14 years, 11 months

[cgutman] 43470: - Fix a typo

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Oct 15 04:26:16 2009 New Revision: 43470 URL: http://svn.reactos.org/svn/reactos?rev=43470&view=rev Log: - Fix a typo Modified: trunk/reactos/include/psdk/wsahelp.h Modified: trunk/reactos/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wsahelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wsahelp.h [iso-8859-1] Thu Oct 15 04:26:16 2009 @@ -70,7 +70,7 @@ typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); -typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); +typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKADDR)(PVOID,PSOCKADDR,PINT); typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,

14 years, 11 months

← Newer
1
...
39
40
41
42
43
44
45
...
65
Older →

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 October 2009