Author: hbelusca
Date: Wed Feb 3 19:12:34 2016
New Revision: 70686
URL: http://svn.reactos.org/svn/reactos?rev=70686&view=rev
Log:
[BOOTMGR]
- Make BmMain stdcall as it's an entry point, the same way as ROSLOAD's OslMain.
[ROSLOAD]
- Fix a comment.
- Fix compilation on x64 and on GCC by specifying the entrypoint stack, exactly
as what we do for KiSystemStartup in the kernel.
Modified:
trunk/reactos/boot/environ/CMakeLists.txt
trunk/reactos/boot/environ/app/bootmgr/bootmgr.c
trunk/reactos/boot/environ/app/bootmgr/bootmgr.h
trunk/reactos/boot/environ/app/rosload/rosload.c
Modified: trunk/reactos/boot/environ/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.txt?rev=70686&r1=70685&r2=70686&view=diff
==============================================================================
--- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Wed Feb 3
19:12:34 2016
@@ -126,7 +126,11 @@
set_subsystem(rosload 16)
endif()
-set_entrypoint(rosload OslMain@4)
+if(ARCH STREQUAL "i386")
+ set_entrypoint(rosload OslMain 4)
+else()
+ set_entrypoint(rosload OslMain)
+endif()
target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr)
Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/bootmgr.c?rev=70686&r1=70685&r2=70686&view=diff
==============================================================================
--- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Feb 3
19:12:34 2016
@@ -2724,6 +2724,7 @@
*
*--*/
NTSTATUS
+NTAPI
BmMain (
_In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
)
Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/bootmgr.h?rev=70686&r1=70685&r2=70686&view=diff
==============================================================================
--- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Wed Feb 3
19:12:34 2016
@@ -62,6 +62,7 @@
/* FUNCTIONS *****************************************************************/
NTSTATUS
+NTAPI
BmMain (
_In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
);
Modified: trunk/reactos/boot/environ/app/rosload/rosload.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/rosload/rosload.c?rev=70686&r1=70685&r2=70686&view=diff
==============================================================================
--- trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] (original)
+++ trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] Wed Feb 3
19:12:34 2016
@@ -17,7 +17,7 @@
/*++
* @name OslMain
*
- * The BmMain function implements the Windows Boot Application entrypoint
for
+ * The OslMain function implements the Windows Boot Application entrypoint
for
* the OS Loader.
*
* @param BootParameters
