Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70642: [0.4.0] * Merge the version improvements in r70641.
by akhaldi＠svn.reactos.org 25 Jan '16

25 Jan '16

Author: akhaldi Date: Mon Jan 25 18:41:22 2016 New Revision: 70642 URL: http://svn.reactos.org/svn/reactos?rev=70642&view=rev Log: [0.4.0] * Merge the version improvements in r70641. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 25 18:41:22 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 25 18:41:22 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641 Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] Mon Jan 25 18:41:22 2016 @@ -20,15 +20,27 @@ set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") set(COPYRIGHT_YEAR "2016") -# KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) + +# KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "") +# KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) +set(KERNEL_VERSION_RELEASE_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") -if(KERNEL_VERSION_PATCH_LEVEL) - set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}") + +if(KERNEL_VERSION_BUILD_TYPE STREQUAL "SVN") + if(KERNEL_VERSION_PATCH_LEVEL) + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}") + else() + set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}") + endif() else() - set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}") + if(KERNEL_VERSION_RELEASE_TYPE STREQUAL "") + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}") + else() + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_RELEASE_TYPE}") + endif() endif() math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")

1 0

[akhaldi] 70641: [VERSION] Improve the way we define ReactOS version, to allow us to mark it as SVN or as a release, and for the latter, allow us to mark it as a candidate or as the final one.
by akhaldi＠svn.reactos.org 25 Jan '16

25 Jan '16

Author: akhaldi Date: Mon Jan 25 18:37:20 2016 New Revision: 70641 URL: http://svn.reactos.org/svn/reactos?rev=70641&view=rev Log: [VERSION] Improve the way we define ReactOS version, to allow us to mark it as SVN or as a release, and for the latter, allow us to mark it as a candidate or as the final one. Modified: trunk/reactos/include/reactos/version.cmake Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Mon Jan 25 18:37:20 2016 @@ -20,15 +20,27 @@ set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") set(COPYRIGHT_YEAR "2016") -# KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) + +# KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN") +# KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) +set(KERNEL_VERSION_RELEASE_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") -if(KERNEL_VERSION_PATCH_LEVEL) - set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}") + +if(KERNEL_VERSION_BUILD_TYPE STREQUAL "SVN") + if(KERNEL_VERSION_PATCH_LEVEL) + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_BUILD_TYPE}") + else() + set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}") + endif() else() - set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}") + if(KERNEL_VERSION_RELEASE_TYPE STREQUAL "") + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}") + else() + set(KERNEL_VERSION "${KERNEL_VERSION}.${KERNEL_VERSION_PATCH_LEVEL}-${KERNEL_VERSION_RELEASE_TYPE}") + endif() endif() math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42")

1 0

[akhaldi] 70640: [0.4.0] * Merge i8042prt's Dell Latitude D630 workaround by Thomas in r70639. CORE-10797
by akhaldi＠svn.reactos.org 25 Jan '16

25 Jan '16

Author: akhaldi Date: Mon Jan 25 18:10:43 2016 New Revision: 70640 URL: http://svn.reactos.org/svn/reactos?rev=70640&view=rev Log: [0.4.0] * Merge i8042prt's Dell Latitude D630 workaround by Thomas in r70639. CORE-10797 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/drivers/input/i8042prt/hwhacks.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 25 18:10:43 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 25 18:10:43 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639 Modified: branches/ros-branch-0_4_0/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_0/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Mon Jan 25 18:10:43 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 }, };

1 0

[akhaldi] 70639: [I8042PRT] Apply a workaround for Dell Latitude D630. By Thomas Faber. CORE-10797
by akhaldi＠svn.reactos.org 25 Jan '16

25 Jan '16

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 }, };

1 0

[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 23 Jan '16

23 Jan '16

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…

1 0

[fireball] 70637: [NTOSKRNL] - Fix a typo.
by fireball＠svn.reactos.org 22 Jan '16

22 Jan '16

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;

1 0

[ion] 70636: [BOOTLIB]: Fuck you binutils.
by ion＠svn.reactos.org 21 Jan '16

21 Jan '16

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 */

1 0

[akhaldi] 70635: [RTL] Revert some accidental formatting changes in r70634. NFC.
by akhaldi＠svn.reactos.org 21 Jan '16

21 Jan '16

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; }

1 0

[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 21 Jan '16

21 Jan '16

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

1 0

[ion] 70633: [BOOTLIB]: Cleanup, less magic.
by ion＠svn.reactos.org 21 Jan '16

21 Jan '16

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; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs