Changeset 19093 in vbox

Timestamp:

Apr 21, 2009 9:24:10 PM (16 years ago)

Author:

vboxsync

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

46242

Message:

SysHlp.cpp: No need to check in vbglUnlockLinear, NIL_RTRTR0MEMOBJ doesn't need to 0, and finally, it's not ugly, just necessary.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

@@ -36 +36 @@
     int rc = VINF_SUCCESS;
 
-    /* Ugly edge case - zero size buffers shouldn't be locked. */
+    /* Zero size buffers shouldn't be locked. */
     if (u32Size == 0)
     {
+        Assert(pv == NULL);
+#ifdef RT_OS_WINDOWS
+        *ppvCtx = NULL;
+#else
         *ppvCtx = NIL_RTR0MEMOBJ;
-        return VINF_SUCCESS;
-    }
+#endif
+        return VINF_SUCCESS;
+    }
+
 #ifdef RT_OS_WINDOWS
     PMDL pMdl = IoAllocateMdl (pv, u32Size, FALSE, FALSE, NULL);
@@ -77 +83 @@
      * r=michael: on Linux, we sometimes have R3 addresses (e.g. shared
      *  clipboard) and sometimes R0 (e.g. shared folders).  We really ought
-     *  to have two separate paths here - at any rate, Linux R0 shouldn't 
+     *  to have two separate paths here - at any rate, Linux R0 shouldn't
      *  end up calling this API.  In practice, Linux R3 does it's own thing
      *  before winding up in the R0 path - which calls this stub API.
@@ -104 +110 @@
     NOREF(u32Size);
 
-    /* Ugly edge case - zero size buffers aren't be locked. */
-    if (pvCtx == NIL_RTR0MEMOBJ)
-        return;
 #ifdef RT_OS_WINDOWS
     PMDL pMdl = (PMDL)pvCtx;