Changeset 4223 in vbox

Timestamp:

Aug 19, 2007 1:02:11 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23717

Message:

bugfixes.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• memobj-r0drv-nt.cpp (modified) (3 diffs)
• memobj-r0drv-win.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp )

trunk/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp

@@ -152 +152 @@
         case RTR0MEMOBJTYPE_MAPPING:
         {
-            Assert(pMemNt->Core.pv);
+            Assert(pMemNt->cMdls == 0 && pMemNt->Core.pv);
             PRTR0MEMOBJNT pMemNtParent = (PRTR0MEMOBJNT)pMemNt->Core.uRel.Child.pParent;
             Assert(pMemNtParent);
             if (pMemNtParent->cMdls)
             {
-                Assert(pMemNt->cMdls == 1 && pMemNt->apMdls[0]);
                 Assert(pMemNtParent->cMdls == 1 && pMemNtParent->apMdls[0]);
                 Assert(     pMemNt->Core.u.Mapping.R0Process == NIL_RTR0PROCESS
@@ -167 +166 @@
                 Assert(     pMemNtParent->Core.enmType == RTR0MEMOBJTYPE_PHYS
                        &&   !pMemNtParent->Core.u.Phys.fAllocated);
+                Assert(pMemNt->Core.u.Mapping.R0Process == NIL_RTR0PROCESS);
                 MmUnmapIoSpace(pMemNt->Core.pv, pMemNt->Core.cb);
             }
@@ -631 +631 @@
                                                     R0Process == NIL_RTR0PROCESS ? KernelMode : UserMode,
                                                     MmCached,
-                                                    pvFixed == (void *)-1 ? pvFixed : NULL,
+                                                    pvFixed != (void *)-1 ? pvFixed : NULL,
                                                     FALSE /* no bug check on failure */,
                                                     NormalPagePriority);