[ros-diffs] [hbelusca] 62687: [NTVDM] - Just define GetNextVDMCommand and ExitVDM at their correct places. - Code cleaning.

Author: hbelusca
Date: Tue Apr  8 14:35:35 2014
New Revision: 62687

URL: http://svn.reactos.org/svn/reactos?rev=62687&view=rev
Log:
[NTVDM]
- Just define GetNextVDMCommand and ExitVDM at their correct places.
- Code cleaning.

Modified:
    branches/ntvdm/dll/win32/kernel32/include/vdm.h
    branches/ntvdm/include/reactos/subsys/win/vdm.h
    branches/ntvdm/subsystems/ntvdm/CMakeLists.txt
    branches/ntvdm/subsystems/ntvdm/ntvdm.h

Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ…
==============================================================================
--- branches/ntvdm/dll/win32/kernel32/include/vdm.h	[iso-8859-1] (original)
+++ branches/ntvdm/dll/win32/kernel32/include/vdm.h	[iso-8859-1] Tue Apr  8 14:35:35 2014
@@ -66,17 +66,4 @@
     IN HANDLE hUserToken OPTIONAL
 );
 
-BOOL
-WINAPI
-GetNextVDMCommand(
-    IN OUT PVDM_COMMAND_INFO CommandData OPTIONAL
-);
-
-VOID
-WINAPI
-ExitVDM(
-    IN BOOL IsWow,
-    IN ULONG iWowTask
-);
-
 /* EOF */

Modified: branches/ntvdm/include/reactos/subsys/win/vdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi…
==============================================================================
--- branches/ntvdm/include/reactos/subsys/win/vdm.h	[iso-8859-1] (original)
+++ branches/ntvdm/include/reactos/subsys/win/vdm.h	[iso-8859-1] Tue Apr  8 14:35:35 2014
@@ -12,7 +12,7 @@
 
 #pragma once
 
-/* CONSTANTS ******************************************************************/
+/* CONSTANTS & TYPES **********************************************************/
 
 typedef enum _VDM_ENTRY_CODE
 {
@@ -85,6 +85,22 @@
     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 */

Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt	[iso-8859-1] Tue Apr  8 14:35:35 2014
@@ -36,7 +36,7 @@
 
 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)

Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/ntvdm.h	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/ntvdm.h	[iso-8859-1] Tue Apr  8 14:35:35 2014
@@ -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, ...);