Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[akhaldi] 70639: [I8042PRT] Apply a workaround for Dell Latitude D630. By Thomas Faber. CORE-10797

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 25 18:08:06 2016 New Revision: 70639 URL: http://svn.reactos.org/svn/reactos?rev=70639&view=rev Log: [I8042PRT] Apply a workaround for Dell Latitude D630. By Thomas Faber. CORE-10797 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Mon Jan 25 18:08:06 2016 @@ -63,6 +63,7 @@ { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, };

8 years, 7 months

[ekohl] 70638: [REACTOS] - Fix height of the inner wizard pages. - Do not show the header for the finish page. - Remove the language selection page and the ReactOS logo because they have been moved...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 23 23:20:32 2016 New Revision: 70638 URL: http://svn.reactos.org/svn/reactos?rev=70638&view=rev Log: [REACTOS] - Fix height of the inner wizard pages. - Do not show the header for the finish page. - Remove the language selection page and the ReactOS logo because they have been moved to userinit. - Start removing groupbox controls from the wizard pages. They just occupy a lot of space. - Resize / realign the install type page and add some descriptive text to all languages. - Allocate setup data from the heap and pass the setup data pointer to each wizard page. - Move the drive wizard page (DriveDlgProc) to a separate file. - Move the common declarations to a new header file. Added: trunk/reactos/base/setup/reactos/drivepage.c (with props) trunk/reactos/base/setup/reactos/reactos.h (with props) Removed: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/ms-MY.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sq-AL.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/lang/zh-TW.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/reactos/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/CMakeLi… Added: trunk/reactos/base/setup/reactos/drivepage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/drivepa… Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… Modified: trunk/reactos/base/setup/reactos/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ms… Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… Modified: trunk/reactos/base/setup/reactos/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sq… Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… Modified: trunk/reactos/base/setup/reactos/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Added: trunk/reactos/base/setup/reactos/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Removed: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/ros… Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc…

8 years, 7 months

[fireball] 70637: [NTOSKRNL] - Fix a typo.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 22 09:23:21 2016 New Revision: 70637 URL: http://svn.reactos.org/svn/reactos?rev=70637&view=rev Log: [NTOSKRNL] - Fix a typo. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=70… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Fri Jan 22 09:23:21 2016 @@ -1792,7 +1792,7 @@ NTSTATUS NTAPI NtSetInformationToken(IN HANDLE TokenHandle, IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, + IN PVOID TokenInformation, IN ULONG TokenInformationLength) { PTOKEN Token;

8 years, 7 months

[ion] 70636: [BOOTLIB]: Fuck you binutils.

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 21 17:08:33 2016 New Revision: 70636 URL: http://svn.reactos.org/svn/reactos?rev=70636&view=rev Log: [BOOTLIB]: Fuck you binutils. Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Thu Jan 21 17:08:33 2016 @@ -113,9 +113,9 @@ set_target_properties(rosload PROPERTIES SUFFIX ".efi") if(MSVC) - add_target_link_flags(rosload "/ignore:4078 /ignore:4254 /DRIVER /FIXED") + add_target_link_flags(rosload "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(rosload "-Wl,--strip-all,--exclude-all-symbols") + add_target_link_flags(rosload "-Wl,--strip-all,--exclude-all-symbols,--dynamicbase,--pic-executable") endif() set_image_base(rosload 0x10000) Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Thu Jan 21 17:08:33 2016 @@ -677,8 +677,10 @@ BOOLEAN First, ImageHashValid; UCHAR LocalBuffer[1024]; UCHAR TrustedBootInformation[52]; + ULONG WorkaroundForBinutils; /* Initialize locals */ + WorkaroundForBinutils = 0; LocalFile = NULL; ImageBuffer = NULL; FileSize = 0; @@ -881,6 +883,7 @@ /* Record our current position (right after the headers) */ EndOfHeaders = (ULONG_PTR)VirtualAddress + HeaderSize; + EfiPrintf(L"here\r\n"); /* Get the first section and iterate through each one */ Section = IMAGE_FIRST_SECTION(NtHeaders); @@ -893,6 +896,7 @@ if ((VirtualSize < Section->VirtualAddress) || ((PVOID)SectionStart < VirtualAddress)) { + EfiPrintf(L"fail 1\r\n"); Status = STATUS_INVALID_IMAGE_FORMAT; goto Quickie; } @@ -940,6 +944,7 @@ &SectionEnd); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"fail 21\r\n"); Status = STATUS_INVALID_IMAGE_FORMAT; goto Quickie; } @@ -957,6 +962,7 @@ &SectionEnd); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"fail 31\r\n"); Status = STATUS_INVALID_IMAGE_FORMAT; goto Quickie; } @@ -974,6 +980,20 @@ /* Are we in the first iteration? */ if (!First) { + /* FUCK YOU BINUTILS */ + if ((*(PULONG)&Section->Name == 'ler.') && (RawSize < AlignSize)) + { + /* Piece of shit won't build relocations when you tell it to, + * either by using --emit-relocs or --dynamicbase. People online + * have found out that by using -pie-executable you can get this + * to happen, but then it turns out that the .reloc section is + * incorrectly sized, and results in a corrupt PE. However, they + * still compute the checksum using the correct value. What idiots. + */ + WorkaroundForBinutils = AlignSize - RawSize; + AlignSize -= WorkaroundForBinutils; + } + /* Yes, read the section data */ Status = ImgpReadAtFileOffset(LocalFile, AlignSize, @@ -994,6 +1014,7 @@ AlignSize, BL_UTL_CHECKSUM_COMPLEMENT | BL_UTL_CHECKSUM_USHORT_BUFFER); + AlignSize += WorkaroundForBinutils; } } @@ -1075,7 +1096,7 @@ } /* Finally, calculate the final checksum and compare it */ - FinalSum = FileSize + PartialSum; + FinalSum = FileSize + PartialSum + WorkaroundForBinutils; if ((FinalSum != CheckSum) && (PartialSum == 0xFFFF)) { /* It hit overflow, so set it to the file size */ @@ -1147,9 +1168,6 @@ { *ImageSize = VirtualSize; } - - EfiPrintf(L"MORE PE TODO: %lx\r\n", NtHeaders->OptionalHeader.AddressOfEntryPoint); - EfiStall(100000000); Quickie: /* Check if we computed the image hash OK */

8 years, 8 months

[akhaldi] 70635: [RTL] Revert some accidental formatting changes in r70634. NFC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 21 16:52:31 2016 New Revision: 70635 URL: http://svn.reactos.org/svn/reactos?rev=70635&view=rev Log: [RTL] Revert some accidental formatting changes in r70634. NFC. Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=70635&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Thu Jan 21 16:52:31 2016 @@ -346,24 +346,24 @@ { PIMAGE_SECTION_HEADER Section = NULL; -if (SectionHeader) -Section = *SectionHeader; - -if ((Section == NULL) || - (Rva < SWAPD(Section->VirtualAddress)) || - (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) -{ - Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); - if (Section == NULL) - return NULL; - if (SectionHeader) - *SectionHeader = Section; -} - -return (PVOID)((ULONG_PTR)BaseAddress + Rva + - (ULONG_PTR)SWAPD(Section->PointerToRawData) - - (ULONG_PTR)SWAPD(Section->VirtualAddress)); + Section = *SectionHeader; + + if ((Section == NULL) || + (Rva < SWAPD(Section->VirtualAddress)) || + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) + { + Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); + if (Section == NULL) + return NULL; + + if (SectionHeader) + *SectionHeader = Section; + } + + return (PVOID)((ULONG_PTR)BaseAddress + Rva + + (ULONG_PTR)SWAPD(Section->PointerToRawData) - + (ULONG_PTR)SWAPD(Section->VirtualAddress)); } PIMAGE_BASE_RELOCATION @@ -426,7 +426,7 @@ default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); DPRINT1("Address %p, Current %u, Count %u, *TypeOffset %x\n", - (PVOID)Address, i, Count, SWAPW(*TypeOffset)); + (PVOID)Address, i, Count, SWAPW(*TypeOffset)); return (PIMAGE_BASE_RELOCATION)NULL; }

8 years, 8 months

[ion] 70634: [RTL/NDK]: For some strange reason, we were missing LdrRelocateImage. Also we had the right type for LdrRelocateImageWithBias, but not the former. Fix that. [BOOTLIB]: Finish the rest ...

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 21 16:16:12 2016 New Revision: 70634 URL: http://svn.reactos.org/svn/reactos?rev=70634&view=rev Log: [RTL/NDK]: For some strange reason, we were missing LdrRelocateImage. Also we had the right type for LdrRelocateImageWithBias, but not the former. Fix that. [BOOTLIB]: Finish the rest of the image loader. However, relocations appear to fail. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/image.c trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Thu Jan 21 16:16:12 2016 @@ -153,7 +153,11 @@ #define BL_LOAD_PE_IMG_EXISTING_BUFFER BL_LOAD_IMG_EXISTING_BUFFER #define BL_LOAD_PE_IMG_COMPUTE_HASH 0x10 #define BL_LOAD_PE_IMG_CHECK_SUBSYSTEM 0x80 +#define BL_LOAD_PE_IMG_SKIP_RELOCATIONS 0x100 #define BL_LOAD_PE_IMG_CHECK_FORCED_INTEGRITY 0x200 +#define BL_LOAD_PE_IMG_IGNORE_CHECKSUM_MISMATCH 0x10000 +#define BL_LOAD_PE_IMG_VALIDATE_ORIGINAL_FILENAME 0x400000 + #define BL_UTL_CHECKSUM_COMPLEMENT 0x10000 #define BL_UTL_CHECKSUM_ROTATE 0x20000 Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Thu Jan 21 16:16:12 2016 @@ -656,33 +656,27 @@ _In_ PBL_IMG_FILE ImageFile, _In_ BL_MEMORY_TYPE MemoryType, _Inout_ PVOID* ImageBase, - _Out_ PULONG ImageSize, + _Out_opt_ PULONG ImageSize, _Inout_opt_ PVOID Hash, _In_ ULONG Flags ) { NTSTATUS Status; ULONG FileSize, HeaderSize; - PVOID ImageBuffer; BL_IMG_FILE LocalFileBuffer; PBL_IMG_FILE LocalFile; - PVOID VirtualAddress; + PVOID VirtualAddress, PreferredBase, ImageBuffer, CertBuffer, HashBuffer; ULONGLONG VirtualSize; + PIMAGE_DATA_DIRECTORY CertDirectory; PHYSICAL_ADDRESS PhysicalAddress; PIMAGE_NT_HEADERS NtHeaders; - USHORT SectionCount; - USHORT CheckSum, PartialSum; + USHORT SectionCount, CheckSum, PartialSum, FinalSum; PIMAGE_SECTION_HEADER Section; - ULONG_PTR EndOfHeaders, SectionStart; - ULONG i; - BOOLEAN First; - ULONG_PTR Slack, SectionEnd; - ULONG SectionSize, RawSize; - ULONG BytesRead, RemainingLength; + ULONG_PTR EndOfHeaders, SectionStart, Slack, SectionEnd; + ULONG i, SectionSize, RawSize, BytesRead, RemainingLength, Offset, AlignSize; + BOOLEAN First, ImageHashValid; UCHAR LocalBuffer[1024]; - USHORT FinalSum; - ULONG Offset; - ULONG AlignSize; + UCHAR TrustedBootInformation[52]; /* Initialize locals */ LocalFile = NULL; @@ -690,8 +684,13 @@ FileSize = 0; First = FALSE; VirtualAddress = NULL; + CertBuffer = NULL; + CertDirectory = NULL; + HashBuffer = NULL; Offset = 0; VirtualSize = 0; + ImageHashValid = FALSE; + RtlZeroMemory(&TrustedBootInformation, sizeof(TrustedBootInformation)); /* Get the size of the image */ Status = ImgpGetFileSize(ImageFile, &FileSize); @@ -1084,18 +1083,98 @@ } /* If the checksum doesn't match, and caller is enforcing, bail out */ - EfiPrintf(L"Final checksum: %lx. Original: %lx\r\n", FinalSum, CheckSum); - if ((FinalSum != CheckSum) && !(Flags & 0x10000)) + if ((FinalSum != CheckSum) && + !(Flags & BL_LOAD_PE_IMG_IGNORE_CHECKSUM_MISMATCH)) { Status = STATUS_IMAGE_CHECKSUM_MISMATCH; goto Quickie; } } + /* Check if the .rsrc section should be checked with the filename */ + if (Flags & BL_LOAD_PE_IMG_VALIDATE_ORIGINAL_FILENAME) + { + EfiPrintf(L"Not yet supported\r\n"); + Status = 0xC0430007; // STATUS_SECUREBOOT_FILE_REPLACED + goto Quickie; + } + + /* Check if we should relocate */ + if (!(Flags & BL_LOAD_PE_IMG_SKIP_RELOCATIONS)) + { + /* Check if we loaded at a different address */ + PreferredBase = (PVOID)NtHeaders->OptionalHeader.ImageBase; + if (VirtualAddress != PreferredBase) + { + /* Yep -- do relocations */ + Status = LdrRelocateImage(VirtualAddress, + "Boot Environment Library", + STATUS_SUCCESS, + STATUS_UNSUCCESSFUL, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) + { + /* That's bad */ + goto Quickie; + } + } + } + +#if BL_TPM_SUPPORT + /* Check if the image hash was valid */ + if (!ImageHashValid) + { + /* Send a TPM/SI notification without a context */ + BlEnNotifyEvent(0x10000002, NULL); + } + + /* Now send a TPM/SI notification with the hash of the loaded image */ + BlMmTranslateVirtualAddress(VirtualAddress, &Context.ImageBase); + Context.HashAlgorithm = HashAlgorithm; + Context.HashSize = HashSize; + Context.FileName = ImageFile->FileName; + Context.ImageSize = VirtualSize; + Context.HashValid = ImageHashValid; + Context.Hash = Hash; + BlEnNotifyEvent(0x10000002, &Context); +#endif + + /* Return the loaded address to the caller */ + *ImageBase = VirtualAddress; + + /* If the caller wanted the image size, return it too */ + if (ImageSize) + { + *ImageSize = VirtualSize; + } + EfiPrintf(L"MORE PE TODO: %lx\r\n", NtHeaders->OptionalHeader.AddressOfEntryPoint); EfiStall(100000000); Quickie: + /* Check if we computed the image hash OK */ + if (ImageHashValid) + { + /* Then free the information that ImgpValidateImageHash set up */ + EfiPrintf(L"leadking trusted boot\r\n"); + //ImgpDestroyTrustedBootInformation(&TrustedBootInformation); + } + + /* Check if we had a hash buffer */ + if (HashBuffer) + { + /* Free it */ + EfiPrintf(L"Leadking hash: %p\r\n", HashBuffer); + //MmPapFreePages(HashBuffer, TRUE); + } + + /* Check if we have a certificate diretory */ + if ((CertBuffer) && (CertDirectory)) + { + /* Free it */ + BlImgUnallocateImageBuffer(CertBuffer, CertDirectory->Size, 0); + } + /* Check if we had an image buffer allocated */ if ((ImageBuffer) && (FileSize)) { @@ -1505,6 +1584,8 @@ ) { /* Not yet implemented. This is the last step! */ + EfiPrintf(L"EFI APPLICATION START!!!\r\n"); + EfiStall(100000000); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Thu Jan 21 16:16:12 2016 @@ -98,7 +98,7 @@ NTAPI LdrRelocateImage( _In_ PVOID NewBase, - _In_ PUCHAR LoaderName, + _In_ PCCH LoaderName, _In_ ULONG Success, _In_ ULONG Conflict, _In_ ULONG Invalid Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=70634&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Thu Jan 21 16:16:12 2016 @@ -346,24 +346,24 @@ { PIMAGE_SECTION_HEADER Section = NULL; +if (SectionHeader) +Section = *SectionHeader; + +if ((Section == NULL) || + (Rva < SWAPD(Section->VirtualAddress)) || + (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) +{ + Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); + if (Section == NULL) + return NULL; + if (SectionHeader) - Section = *SectionHeader; - - if ((Section == NULL) || - (Rva < SWAPD(Section->VirtualAddress)) || - (Rva >= SWAPD(Section->VirtualAddress) + SWAPD(Section->SizeOfRawData))) - { - Section = RtlImageRvaToSection(NtHeader, BaseAddress, Rva); - if (Section == NULL) - return NULL; - - if (SectionHeader) - *SectionHeader = Section; - } - - return (PVOID)((ULONG_PTR)BaseAddress + Rva + - (ULONG_PTR)SWAPD(Section->PointerToRawData) - - (ULONG_PTR)SWAPD(Section->VirtualAddress)); + *SectionHeader = Section; +} + +return (PVOID)((ULONG_PTR)BaseAddress + Rva + + (ULONG_PTR)SWAPD(Section->PointerToRawData) - + (ULONG_PTR)SWAPD(Section->VirtualAddress)); } PIMAGE_BASE_RELOCATION @@ -426,7 +426,7 @@ default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); DPRINT1("Address %p, Current %u, Count %u, *TypeOffset %x\n", - (PVOID)Address, i, Count, SWAPW(*TypeOffset)); + (PVOID)Address, i, Count, SWAPW(*TypeOffset)); return (PIMAGE_BASE_RELOCATION)NULL; } @@ -434,6 +434,18 @@ } return (PIMAGE_BASE_RELOCATION)TypeOffset; +} + +ULONG +NTAPI +LdrRelocateImage( + IN PVOID BaseAddress, + IN PCCH LoaderName, + IN ULONG Success, + IN ULONG Conflict, + IN ULONG Invalid) +{ + return LdrRelocateImageWithBias(BaseAddress, 0, LoaderName, Success, Conflict, Invalid); } ULONG

8 years, 8 months

[ion] 70633: [BOOTLIB]: Cleanup, less magic.

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 21 15:47:14 2016 New Revision: 70633 URL: http://svn.reactos.org/svn/reactos?rev=70633&view=rev Log: [BOOTLIB]: Cleanup, less magic. Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/image.c trunk/reactos/boot/environ/lib/misc/util.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Thu Jan 21 15:47:14 2016 @@ -154,6 +154,12 @@ #define BL_LOAD_PE_IMG_COMPUTE_HASH 0x10 #define BL_LOAD_PE_IMG_CHECK_SUBSYSTEM 0x80 #define BL_LOAD_PE_IMG_CHECK_FORCED_INTEGRITY 0x200 + +#define BL_UTL_CHECKSUM_COMPLEMENT 0x10000 +#define BL_UTL_CHECKSUM_ROTATE 0x20000 +#define BL_UTL_CHECKSUM_NEGATE 0x40000 +#define BL_UTL_CHECKSUM_UCHAR_BUFFER 0x01 +#define BL_UTL_CHECKSUM_USHORT_BUFFER 0x02 /* ENUMERATIONS **************************************************************/ @@ -1618,6 +1624,14 @@ NTSTATUS BlUtlRegisterProgressRoutine ( VOID + ); + +ULONG +BlUtlCheckSum ( + _In_ ULONG PartialSum, + _In_ PUCHAR Buffer, + _In_ ULONG Length, + _In_ ULONG Flags ); NTSTATUS Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Thu Jan 21 15:47:14 2016 @@ -649,54 +649,6 @@ /* Unallocate the image buffer */ return BlImgUnallocateImageBuffer(ImageBase, ImageSize, ImageFlags); -} - -unsigned int BlUtlCheckSum(unsigned int PartialSum, PUCHAR Source, unsigned int Length, unsigned int Flags) -{ - unsigned int Type; // eax@1 - int Type1; // eax@1 - unsigned int AlignedLength; // ebx@3 - unsigned int i; // ebx@21 MAPDST - - Type = Flags & 3; - Type1 = Type - 1; - if (Type1) - { - if (Type1 == 1) - { - PartialSum = (unsigned __int16)PartialSum; - AlignedLength = Length & ~1; - if (Length & ~1) - { - i = 0; - do - { - PartialSum += *(unsigned __int16 *)&Source[i]; - if (Flags & 0x10000) - PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); - i += 2; - } while (i < AlignedLength); - } - - if (Length != AlignedLength) - { - PartialSum += (unsigned __int8)Source[AlignedLength]; - if (Flags & 0x10000) - PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); - } - if (Flags & 0x40000) - return ~PartialSum; - PartialSum = (unsigned __int16)PartialSum; - } - } - else - { - EfiPrintf(L"checksum type not supported\r\n"); - } - - if (Flags & 0x40000) - return ~PartialSum; - return PartialSum; } NTSTATUS @@ -921,7 +873,11 @@ NtHeaders->OptionalHeader.CheckSum = 0; /* Calculate the checksum of the header, and restore the original one */ - PartialSum = BlUtlCheckSum(0, VirtualAddress, HeaderSize, 0x10002); + PartialSum = BlUtlCheckSum(0, + VirtualAddress, + HeaderSize, + BL_UTL_CHECKSUM_COMPLEMENT | + BL_UTL_CHECKSUM_USHORT_BUFFER); NtHeaders->OptionalHeader.CheckSum = CheckSum; /* Record our current position (right after the headers) */ @@ -1037,7 +993,8 @@ PartialSum = BlUtlCheckSum(PartialSum, (PUCHAR)SectionStart, AlignSize, - 0x10002); + BL_UTL_CHECKSUM_COMPLEMENT | + BL_UTL_CHECKSUM_USHORT_BUFFER); } } @@ -1114,7 +1071,8 @@ PartialSum = BlUtlCheckSum(PartialSum, LocalBuffer, BytesRead, - 0x10002); + BL_UTL_CHECKSUM_COMPLEMENT | + BL_UTL_CHECKSUM_USHORT_BUFFER); } /* Finally, calculate the final checksum and compare it */ Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Thu Jan 21 15:47:14 2016 @@ -720,3 +720,61 @@ return Status; } +ULONG +BlUtlCheckSum ( + _In_ ULONG PartialSum, + _In_ PUCHAR Buffer, + _In_ ULONG Length, + _In_ ULONG Flags + ) +{ + ULONG i; + + if (Flags & BL_UTL_CHECKSUM_UCHAR_BUFFER) + { + EfiPrintf(L"Not supported\r\n"); + return 0; + } + else if (Flags & BL_UTL_CHECKSUM_USHORT_BUFFER) + { + PartialSum = (unsigned __int16)PartialSum; + Length &= ~1; + + for (i = 0; i < Length; i += 2) + { + PartialSum += *(unsigned __int16 *)&Buffer[i]; + if (Flags & BL_UTL_CHECKSUM_COMPLEMENT) + { + PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); + } + } + + if (Length != Length) + { + PartialSum += (unsigned __int8)Buffer[Length]; + if (Flags & BL_UTL_CHECKSUM_COMPLEMENT) + { + PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); + } + } + + if (Flags & BL_UTL_CHECKSUM_NEGATE) + { + return ~PartialSum; + } + + PartialSum = (unsigned __int16)PartialSum; + } + else + { + /* Invalid mode */ + return 0; + } + + if (Flags & BL_UTL_CHECKSUM_NEGATE) + { + return ~PartialSum; + } + + return PartialSum; +}

8 years, 8 months

[ion] 70632: [BOOTLIB]: Implement checksum calculation for PE header sum. [BOOTLIB]: Implement most of ImgpLoadPEImage. The checksum of the mapped image file matches the checksum in the flat PE fil...

by ion＠svn.reactos.org

Author: ion Date: Thu Jan 21 05:16:40 2016 New Revision: 70632 URL: http://svn.reactos.org/svn/reactos?rev=70632&view=rev Log: [BOOTLIB]: Implement checksum calculation for PE header sum. [BOOTLIB]: Implement most of ImgpLoadPEImage. The checksum of the mapped image file matches the checksum in the flat PE file, meaning our load loop works as designed. Next step are relocations and we'll be done. Modified: trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Thu Jan 21 05:16:40 2016 @@ -651,6 +651,54 @@ return BlImgUnallocateImageBuffer(ImageBase, ImageSize, ImageFlags); } +unsigned int BlUtlCheckSum(unsigned int PartialSum, PUCHAR Source, unsigned int Length, unsigned int Flags) +{ + unsigned int Type; // eax@1 + int Type1; // eax@1 + unsigned int AlignedLength; // ebx@3 + unsigned int i; // ebx@21 MAPDST + + Type = Flags & 3; + Type1 = Type - 1; + if (Type1) + { + if (Type1 == 1) + { + PartialSum = (unsigned __int16)PartialSum; + AlignedLength = Length & ~1; + if (Length & ~1) + { + i = 0; + do + { + PartialSum += *(unsigned __int16 *)&Source[i]; + if (Flags & 0x10000) + PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); + i += 2; + } while (i < AlignedLength); + } + + if (Length != AlignedLength) + { + PartialSum += (unsigned __int8)Source[AlignedLength]; + if (Flags & 0x10000) + PartialSum = (unsigned __int16)((PartialSum >> 16) + PartialSum); + } + if (Flags & 0x40000) + return ~PartialSum; + PartialSum = (unsigned __int16)PartialSum; + } + } + else + { + EfiPrintf(L"checksum type not supported\r\n"); + } + + if (Flags & 0x40000) + return ~PartialSum; + return PartialSum; +} + NTSTATUS ImgpLoadPEImage ( _In_ PBL_IMG_FILE ImageFile, @@ -670,11 +718,28 @@ ULONGLONG VirtualSize; PHYSICAL_ADDRESS PhysicalAddress; PIMAGE_NT_HEADERS NtHeaders; + USHORT SectionCount; + USHORT CheckSum, PartialSum; + PIMAGE_SECTION_HEADER Section; + ULONG_PTR EndOfHeaders, SectionStart; + ULONG i; + BOOLEAN First; + ULONG_PTR Slack, SectionEnd; + ULONG SectionSize, RawSize; + ULONG BytesRead, RemainingLength; + UCHAR LocalBuffer[1024]; + USHORT FinalSum; + ULONG Offset; + ULONG AlignSize; /* Initialize locals */ LocalFile = NULL; ImageBuffer = NULL; FileSize = 0; + First = FALSE; + VirtualAddress = NULL; + Offset = 0; + VirtualSize = 0; /* Get the size of the image */ Status = ImgpGetFileSize(ImageFile, &FileSize); @@ -846,6 +911,229 @@ goto Quickie; } + First = FALSE; + + /* Record how many sections we have */ + SectionCount = NtHeaders->FileHeader.NumberOfSections; + + /* Capture the current checksum and reset it */ + CheckSum = NtHeaders->OptionalHeader.CheckSum; + NtHeaders->OptionalHeader.CheckSum = 0; + + /* Calculate the checksum of the header, and restore the original one */ + PartialSum = BlUtlCheckSum(0, VirtualAddress, HeaderSize, 0x10002); + NtHeaders->OptionalHeader.CheckSum = CheckSum; + + /* Record our current position (right after the headers) */ + EndOfHeaders = (ULONG_PTR)VirtualAddress + HeaderSize; + + /* Get the first section and iterate through each one */ + Section = IMAGE_FIRST_SECTION(NtHeaders); + for (i = 0; i < SectionCount; i++) + { + /* Compute where this section starts */ + SectionStart = (ULONG_PTR)VirtualAddress + Section->VirtualAddress; + + /* Make sure that the section fits within the image */ + if ((VirtualSize < Section->VirtualAddress) || + ((PVOID)SectionStart < VirtualAddress)) + { + Status = STATUS_INVALID_IMAGE_FORMAT; + goto Quickie; + } + + /* Check if there's slack space between header end and the section */ + if (!(First) && (EndOfHeaders < SectionStart)) + { + /* Zero it out */ + Slack = SectionStart - EndOfHeaders; + RtlZeroMemory((PVOID)EndOfHeaders, Slack); + } + + /* Get the section virtual size and the raw size */ + SectionSize = Section->Misc.VirtualSize; + RawSize = Section->SizeOfRawData; + + /* Safely align the raw size by 2 */ + Status = RtlULongAdd(RawSize, 1, &AlignSize); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + AlignSize = ALIGN_DOWN_BY(AlignSize, 2); + + /* IF we don't have a virtual size, use the raw size */ + if (!SectionSize) + { + SectionSize = RawSize; + } + + /* If we don't have raw data, ignore the raw size */ + if (!Section->PointerToRawData) + { + RawSize = 0; + } + else if (SectionSize < RawSize) + { + /* And if the virtual size is smaller, use it as the final size */ + RawSize = SectionSize; + } + + /* Make sure that the section doesn't overflow in memory */ + Status = RtlULongAdd(Section->VirtualAddress, + SectionSize, + &SectionEnd); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_IMAGE_FORMAT; + goto Quickie; + } + + /* Make sure that it fits within the image */ + if (VirtualSize < SectionEnd) + { + Status = STATUS_INVALID_IMAGE_FORMAT; + goto Quickie; + } + + /* Make sure it doesn't overflow on disk */ + Status = RtlULongAdd(Section->VirtualAddress, + AlignSize, + &SectionEnd); + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_IMAGE_FORMAT; + goto Quickie; + } + + /* Make sure that it fits within the disk image as well */ + if (VirtualSize < SectionEnd) + { + Status = STATUS_INVALID_IMAGE_FORMAT; + goto Quickie; + } + + /* So does this section have a valid size after all? */ + if (RawSize) + { + /* Are we in the first iteration? */ + if (!First) + { + /* Yes, read the section data */ + Status = ImgpReadAtFileOffset(LocalFile, + AlignSize, + Section->PointerToRawData, + (PVOID)SectionStart, + NULL); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Update our current offset */ + Offset = AlignSize + Section->PointerToRawData; + + /* Update the checksum to include this section */ + PartialSum = BlUtlCheckSum(PartialSum, + (PUCHAR)SectionStart, + AlignSize, + 0x10002); + } + } + + /* Are we in the first iteration? */ + if (!First) + { + /* Is there space at the end of the section? */ + if (RawSize < SectionSize) + { + /* Zero out the slack space that's there */ + Slack = SectionSize - RawSize; + RtlZeroMemory((PVOID)(SectionStart + RawSize), Slack); + } + + /* Update our tail offset */ + EndOfHeaders = SectionStart + SectionSize; + } + + /* Move to the next section */ + Section++; + } + + /* Are we in the first iteration? */ + if (!First) + { + /* Go to the end of the file */ + SectionStart = (ULONG_PTR)VirtualAddress + VirtualSize; + + /* Is there still some slack space left? */ + if (EndOfHeaders < SectionStart) + { + /* Zero it out */ + Slack = SectionStart - EndOfHeaders; + RtlZeroMemory((PVOID)EndOfHeaders, Slack); + } + } + + /* Did the first iteration complete OK? */ + if ((NT_SUCCESS(Status)) && !(First)) + { + /* Check how many non-image bytes are left in the file */ + RemainingLength = FileSize - Offset; + while (RemainingLength) + { + /* See if the read will fit into our local buffer */ + if (RemainingLength >= sizeof(LocalBuffer)) + { + /* Nope, cap it */ + BytesRead = sizeof(LocalBuffer); + } + else + { + /* Yes, but there's less to read */ + BytesRead = RemainingLength; + } + + /* Read 1024 bytes into the local buffer */ + Status = ImgpReadAtFileOffset(LocalFile, + BytesRead, + Offset, + LocalBuffer, + &BytesRead); + if (!(NT_SUCCESS(Status)) || !(BytesRead)) + { + Status = STATUS_FILE_INVALID; + goto Quickie; + } + + /* Advance the offset and reduce the length */ + RemainingLength -= BytesRead; + Offset += BytesRead; + + /* Compute the checksum of this leftover space */ + PartialSum = BlUtlCheckSum(PartialSum, + LocalBuffer, + BytesRead, + 0x10002); + } + + /* Finally, calculate the final checksum and compare it */ + FinalSum = FileSize + PartialSum; + if ((FinalSum != CheckSum) && (PartialSum == 0xFFFF)) + { + /* It hit overflow, so set it to the file size */ + FinalSum = FileSize; + } + + /* If the checksum doesn't match, and caller is enforcing, bail out */ + EfiPrintf(L"Final checksum: %lx. Original: %lx\r\n", FinalSum, CheckSum); + if ((FinalSum != CheckSum) && !(Flags & 0x10000)) + { + Status = STATUS_IMAGE_CHECKSUM_MISMATCH; + goto Quickie; + } + } + EfiPrintf(L"MORE PE TODO: %lx\r\n", NtHeaders->OptionalHeader.AddressOfEntryPoint); EfiStall(100000000);

8 years, 8 months

[ion] 70631: [DDK]: SVN isn't GIT alex. It's not smart enough to commit the entire tree, only the place where you right-clicked.

by ion＠svn.reactos.org

Author: ion Date: Wed Jan 20 17:01:53 2016 New Revision: 70631 URL: http://svn.reactos.org/svn/reactos?rev=70631&view=rev Log: [DDK]: SVN isn't GIT alex. It's not smart enough to commit the entire tree, only the place where you right-clicked. Modified: trunk/reactos/include/ddk/ntimage.h Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntimage.h [iso-8859-1] Wed Jan 20 17:01:53 2016 @@ -430,16 +430,38 @@ ((NtHeader))->FileHeader.SizeOfOptionalHeader)) // +// Subsystems +// +#define IMAGE_SUBSYSTEM_UNKNOWN 0 +#define IMAGE_SUBSYSTEM_NATIVE 1 +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_SUBSYSTEM_OS2_CUI 5 +#define IMAGE_SUBSYSTEM_POSIX_CUI 7 +#define IMAGE_SUBSYSTEM_NATIVE_WINDOWS 8 +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 +#define IMAGE_SUBSYSTEM_EFI_ROM 13 +#define IMAGE_SUBSYSTEM_XBOX 14 +#define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION 16 +#define IMAGE_SUBSYSTEM_XBOX_CODE_CATALOG 17 + +// // Dll Characteristics // -#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 -#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 -#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 -#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 -#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 -#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 -#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 +#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA 0x0020 +#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 +#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 +#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 +#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER 0x1000 +#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_GUARD_CF 0x4000 +#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 // // Loader Flags

8 years, 8 months

[ion] 70630: [ROSLOAD]: SUBSYSTEM_WINDOWS_BOOT_APPLICATION is 16, not 14.

by ion＠svn.reactos.org

Author: ion Date: Wed Jan 20 17:00:51 2016 New Revision: 70630 URL: http://svn.reactos.org/svn/reactos?rev=70630&view=rev Log: [ROSLOAD]: SUBSYSTEM_WINDOWS_BOOT_APPLICATION is 16, not 14. Modified: trunk/reactos/boot/environ/CMakeLists.txt Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Wed Jan 20 17:00:51 2016 @@ -123,7 +123,7 @@ if(MSVC) set_subsystem(rosload BOOT_APPLICATION) else() - set_subsystem(rosload 14) + set_subsystem(rosload 16) endif() set_entrypoint(rosload OslMain@4)

8 years, 8 months

← Newer
1
2
3
4
5
6
7
...
20
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 January 2016