[ros-diffs] [hbelusca] 67351: [NTVDM] - Fix copy-paste error in the initialization of DriverHeader. - Use BOP_... syntax for BOP #define names (to comply with the rest of the code).

Author: hbelusca
Date: Wed Apr 22 17:27:35 2015
New Revision: 67351

URL: http://svn.reactos.org/svn/reactos?rev=67351&view=rev
Log:
[NTVDM]
- Fix copy-paste error in the initialization of DriverHeader.
- Use BOP_... syntax for BOP #define names (to comply with the rest of the code).

Modified:
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d...
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c	[iso-8859-1] Wed Apr 22 17:27:35 2015
@@ -375,7 +375,7 @@
     RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->StrategyRoutine),
                   StrategyRoutine,
                   sizeof(StrategyRoutine));
-    RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->StrategyRoutine),
+    RtlMoveMemory(SEG_OFF_TO_PTR(Segment, DriverHeader->InterruptRoutine),
                   InterruptRoutine,
                   sizeof(InterruptRoutine));

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d...
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c	[iso-8859-1] Wed Apr 22 17:27:35 2015
@@ -20,7 +20,9 @@
 #include "himem.h"

#define XMS_DEVICE_NAME "XMSXXXX0"
-#define XMS_BOP 0x52
+
+/* BOP Identifiers */
+#define BOP_XMS 0x52

/* PRIVATE VARIABLES **********************************************************/

@@ -32,7 +34,7 @@
     0x90, // nop
     LOBYTE(EMULATOR_BOP),
     HIBYTE(EMULATOR_BOP),
-    XMS_BOP,
+    BOP_XMS,
     0xCB // retf
 };

@@ -264,7 +266,7 @@
                              XMS_DEVICE_NAME,
                              sizeof(EntryProcedure));

-    RegisterBop(XMS_BOP, XmsBopProcedure);
+    RegisterBop(BOP_XMS, XmsBopProcedure);

/* Copy the entry routine to the device private area */
     RtlMoveMemory(FAR_POINTER(DEVICE_PRIVATE_AREA(Node->Driver)),
@@ -274,6 +276,6 @@

VOID XmsCleanup(VOID)
 {
-    RegisterBop(XMS_BOP, NULL);
+    RegisterBop(BOP_XMS, NULL);
     DosDeleteDevice(Node);
 }