[NTVDM]

- Just define GetNextVDMCommand and ExitVDM at their correct places.
- Code cleaning.

svn path=/branches/ntvdm/; revision=62687

dll/win32/kernel32/include/vdm.h

@@ -66,17 +66,4 @@ BaseCheckVDM(
     IN HANDLE hUserToken OPTIONAL
 );
 
-BOOL
-WINAPI
-GetNextVDMCommand(
-    IN OUT PVDM_COMMAND_INFO CommandData OPTIONAL
-);
-
-VOID
-WINAPI
-ExitVDM(
-    IN BOOL IsWow,
-    IN ULONG iWowTask
-);
-
 /* EOF */

include/reactos/subsys/win/vdm.h

@@ -12,7 +12,7 @@
 
 #pragma once
 
-/* CONSTANTS ******************************************************************/
+/* CONSTANTS & TYPES **********************************************************/
 
 typedef enum _VDM_ENTRY_CODE
 {
@@ -85,6 +85,22 @@ typedef struct
     BOOLEAN ComingFromBat;
 } VDM_COMMAND_INFO, *PVDM_COMMAND_INFO;
 
+
+/* FUNCTION PROTOTYPES ********************************************************/
+
+BOOL
+WINAPI
+GetNextVDMCommand(
+    IN OUT PVDM_COMMAND_INFO CommandData OPTIONAL
+);
+
+VOID
+WINAPI
+ExitVDM(
+    IN BOOL IsWow,
+    IN ULONG iWowTask
+);
+
 #endif // _VDM_H
 
 /* EOF */

subsystems/ntvdm/CMakeLists.txt

@@ -36,7 +36,7 @@ list(APPEND SOURCE
 
 add_executable(ntvdm ${SOURCE})
 set_module_type(ntvdm win32cui UNICODE)
+set_image_base(ntvdm 0x0F000000)
 target_link_libraries(ntvdm fast486)
 add_importlibs(ntvdm user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)
-set_image_base(ntvdm 0x0F000000)

subsystems/ntvdm/ntvdm.h

@@ -29,21 +29,6 @@
 
 #include <debug.h>
 
-/* PROTOTYPES *****************************************************************/
-
-BOOL
-WINAPI
-GetNextVDMCommand(
-    IN OUT PVDM_COMMAND_INFO CommandData OPTIONAL
-);
-
-VOID
-WINAPI
-ExitVDM(
-    IN BOOL IsWow,
-    IN ULONG iWowTask
-);
-
 /* FUNCTIONS ******************************************************************/
 
 VOID DisplayMessage(LPCWSTR Format, ...);