[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.

svn path=/trunk/; revision=70686

reactos/boot/environ/CMakeLists.txt

@@ -126,7 +126,11 @@ else()
     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)
 

reactos/boot/environ/app/bootmgr/bootmgr.c

@@ -2724,6 +2724,7 @@ Quickie:
  *
  *--*/
 NTSTATUS
+NTAPI
 BmMain (
     _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
     )

reactos/boot/environ/app/bootmgr/bootmgr.h

@@ -62,6 +62,7 @@ typedef struct _BL_PACKED_BOOT_ERROR
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
+NTAPI
 BmMain (
     _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
     );

reactos/boot/environ/app/rosload/rosload.c

@@ -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