Changeset 55327 in vbox

Timestamp:

Apr 17, 2015 12:24:58 PM (10 years ago)

Author:

vboxsync

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

99650

Message:

Backed out r99649; doesn't work in guest contexts, d'oh.

File:

• trunk/include/VBox/hgcmsvc.h (modified) (13 diffs)

trunk/include/VBox/hgcmsvc.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 
 #include <iprt/assert.h>
-#include <iprt/mem.h>
 #include <iprt/string.h>
 #include <VBox/cdefs.h>
@@ -89 +88 @@
 
 #define VBOX_HGCM_SVC_PARM_INVALID (0U)
-#define VBOX_HGCM_SVC_PARM_32BIT   (1U)
-#define VBOX_HGCM_SVC_PARM_64BIT   (2U)
-#define VBOX_HGCM_SVC_PARM_PTR     (3U)
+#define VBOX_HGCM_SVC_PARM_32BIT (1U)
+#define VBOX_HGCM_SVC_PARM_64BIT (2U)
+#define VBOX_HGCM_SVC_PARM_PTR   (3U)
 
 typedef struct VBOXHGCMSVCPARM
@@ -110 +109 @@
 #ifdef __cplusplus
     /** Extract a uint32_t value from an HGCM parameter structure */
-    int getUInt32(uint32_t *u32)
+    int getUInt32 (uint32_t *u32)
     {
         AssertPtrReturn(u32, VERR_INVALID_POINTER);
@@ -122 +121 @@
 
     /** Extract a uint64_t value from an HGCM parameter structure */
-    int getUInt64(uint64_t *u64)
+    int getUInt64 (uint64_t *u64)
     {
         AssertPtrReturn(u64, VERR_INVALID_POINTER);
@@ -134 +133 @@
 
     /** Extract a pointer value from an HGCM parameter structure */
-    int getPointer(void **ppv, uint32_t *pcb)
+    int getPointer (void **ppv, uint32_t *pcb)
     {
         AssertPtrReturn(ppv, VERR_INVALID_POINTER);
@@ -149 +148 @@
 
     /** Extract a constant pointer value from an HGCM parameter structure */
-    int getPointer(const void **ppcv, uint32_t *pcb)
+    int getPointer (const void **ppcv, uint32_t *pcb)
     {
         AssertPtrReturn(ppcv, VERR_INVALID_POINTER);
@@ -161 +160 @@
     /** Extract a pointer value to a non-empty buffer from an HGCM parameter
      * structure */
-    int getBuffer(void **ppv, uint32_t *pcb)
+    int getBuffer (void **ppv, uint32_t *pcb)
     {
         AssertPtrReturn(ppv, VERR_INVALID_POINTER);
@@ -182 +181 @@
     /** Extract a pointer value to a non-empty constant buffer from an HGCM
      * parameter structure */
-    int getBuffer(const void **ppcv, uint32_t *pcb)
+    int getBuffer (const void **ppcv, uint32_t *pcb)
     {
         AssertPtrReturn(ppcv, VERR_INVALID_POINTER);
@@ -193 +192 @@
 
     /** Extract a string value from an HGCM parameter structure */
-    int getString(char **ppch, uint32_t *pcb)
+    int getString (char **ppch, uint32_t *pcb)
     {
         uint32_t cb = 0;
@@ -212 +211 @@
 
     /** Extract a constant string value from an HGCM parameter structure */
-    int getString(const char **ppch, uint32_t *pcb)
+    int getString (const char **ppch, uint32_t *pcb)
     {
         char *pch = NULL;
@@ -235 +234 @@
 
     /** Set a pointer value to an HGCM parameter structure */
-    int setPointer(void *pv, uint32_t cb, bool fDeepCopy = false)
+    void setPointer(void *pv, uint32_t cb)
     {
         type = VBOX_HGCM_SVC_PARM_PTR;
-        void *addr = fDeepCopy ? RTMemDup(pv, cb) : pv;
-        if (fDeepCopy && !addr)
-            return VERR_NO_MEMORY;
-        u.pointer.addr = addr;
+        u.pointer.addr = pv;
         u.pointer.size = cb;
     }
 
     /** Set a const string value to an HGCM parameter structure */
-    int setString(const char *psz, bool fDeepCopy = false)
+    void setString(const char *psz)
     {
         type = VBOX_HGCM_SVC_PARM_PTR;
-        void *pszaddr = fDeepCopy ? (void *)RTStrDup(psz) : (void *)psz;
-        if (fDeepCopy && !pszaddr)
-            return VERR_NO_MEMORY;
-        u.pointer.addr = pszaddr;
-        u.pointer.size = (uint32_t)strlen((char *)pszaddr) + 1;
+        u.pointer.addr = (void *)psz;
+        u.pointer.size = (uint32_t)strlen(psz) + 1;
     }
 
@@ -320 +313 @@
 
     VBOXHGCMSVCPARM() : type(VBOX_HGCM_SVC_PARM_INVALID) {}
-#endif /* __cplusplus */
+#endif
 } VBOXHGCMSVCPARM;