[hbelusca] 66398: [VERSION] - Revision string without the dash. That allows to possibly use a different separator. - Just use the ROS revision number in the kernel SOS banner, instead of using a co...
Author: hbelusca Date: Sat Feb 21 22:38:22 2015 New Revision: 66398
URL: http://svn.reactos.org/svn/reactos?rev=66398&view=rev Log: [VERSION] - Revision string without the dash. That allows to possibly use a different separator. - Just use the ROS revision number in the kernel SOS banner, instead of using a convoluted computation that overflows when the revision number is >= 65536. CORE-8877 #resolve #comment Fixed in r66398, thanks!
Modified: trunk/reactos/include/reactos/buildno.h.cmake trunk/reactos/include/reactos/version.cmake trunk/reactos/ntoskrnl/ex/init.c
Modified: trunk/reactos/include/reactos/buildno.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/buildno.h.c... ============================================================================== --- trunk/reactos/include/reactos/buildno.h.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/buildno.h.cmake [iso-8859-1] Sat Feb 21 22:38:22 2015 @@ -3,8 +3,8 @@ #define _INC_REACTOS_BUILDNO #define KERNEL_VERSION_BUILD @KERNEL_VERSION_BUILD@ #define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ -#define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@@REVISION@" -#define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@@REVISION@\0" +#define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" +#define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" #define KERNEL_RELEASE_RC "@KERNEL_VERSION@\0" #define KERNEL_RELEASE_STR "@KERNEL_VERSION@" #define KERNEL_VERSION_RC "@KERNEL_VERSION@\0"
Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cma... ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Sat Feb 21 22:38:22 2015 @@ -50,14 +50,14 @@ set(DLL_VERSION_STR "${REACTOS_DLL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}-${KERNEL_VERSION_BUILD_TYPE}")
# get svn revision number -set(REVISION "-rUNKNOWN") +set(REVISION "rUNKNOWN") set(KERNEL_VERSION_BUILD_HEX "0") if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") find_package(Subversion) if(Subversion_FOUND) subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO) if(SVNINFO_WC_REVISION) - set(REVISION "-r${SVNINFO_WC_REVISION}") + set(REVISION "r${SVNINFO_WC_REVISION}") converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX) endif() endif()
Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=6639... ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Feb 21 22:38:22 2015 @@ -1226,7 +1226,8 @@ Status = RtlStringCbPrintfA(RcEnd, Remaining, "r%u", - (CmNtCSDVersion & 0xFFFF0000) >> 16); + /*(CmNtCSDVersion & 0xFFFF0000) >> 16*/ + KERNEL_VERSION_BUILD_HEX); if (!NT_SUCCESS(Status)) { /* Fail */
-
hbelusca＠svn.reactos.org