Changeset 18451 in vbox for trunk/src

Timestamp:

Mar 28, 2009 4:04:18 AM (16 years ago)

Author:

vboxsync

Message:

VBoxGuestR3LibGuestProp.cpp: load of size_t warnings. Simplified the parameter setting by adding VbglHGCMParmPtrSetString.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• VBGLR3Internal.h (modified) (1 diff)
• VBoxGuestR3LibGuestProp.cpp (modified) (10 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h

@@ -81 +81 @@
 }
 
+
+#ifdef ___iprt_string_h
+
+DECLINLINE(void) VbglHGCMParmPtrSetString(HGCMFunctionParameter *pParm, const char *psz)
+{
+    pParm->type                    = VMMDevHGCMParmType_LinAddr;
+    pParm->u.Pointer.size          = (uint32_t)strlen(psz) + 1;
+    pParm->u.Pointer.u.linearAddr  = (uintptr_t)psz;
+}
+
+#endif /* ___iprt_string_h */
+
 __END_DECLS
 

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

@@ -124 +124 @@
         Msg.hdr.u32Function = SET_PROP_VALUE;
         Msg.hdr.cParms = 3;
-        VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName), strlen(pszName) + 1);
-        VbglHGCMParmPtrSet(&Msg.value, const_cast<char *>(pszValue), strlen(pszValue) + 1);
-        VbglHGCMParmPtrSet(&Msg.flags, const_cast<char *>(pszFlags), strlen(pszFlags) + 1);
+        VbglHGCMParmPtrSetString(&Msg.name,  pszName);
+        VbglHGCMParmPtrSetString(&Msg.value, pszValue);
+        VbglHGCMParmPtrSetString(&Msg.flags, pszFlags);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
@@ -139 +139 @@
         Msg.hdr.u32Function = DEL_PROP;
         Msg.hdr.cParms = 1;
-        VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName), strlen(pszName) + 1);
+        VbglHGCMParmPtrSetString(&Msg.name, pszName);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
@@ -173 +173 @@
         Msg.hdr.u32Function = SET_PROP_VALUE;
         Msg.hdr.cParms = 2;
-        VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName), strlen(pszName) + 1);
-        VbglHGCMParmPtrSet(&Msg.value, const_cast<char *>(pszValue), strlen(pszValue) + 1);
+        VbglHGCMParmPtrSetString(&Msg.name, pszName);
+        VbglHGCMParmPtrSetString(&Msg.value, pszValue);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
@@ -187 +187 @@
         Msg.hdr.u32Function = DEL_PROP;
         Msg.hdr.cParms = 1;
-        VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName), strlen(pszName) + 1);
+        VbglHGCMParmPtrSetString(&Msg.name, pszName);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
@@ -281 +281 @@
     Msg.hdr.u32Function = GET_PROP;
     Msg.hdr.cParms = 4;
-    VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName), strlen(pszName) + 1);
+    VbglHGCMParmPtrSetString(&Msg.name, pszName);
     VbglHGCMParmPtrSet(&Msg.buffer, pvBuf, cbBuf);
     VbglHGCMParmUInt64Set(&Msg.timestamp, 0);
@@ -442 +442 @@
                                          uint32_t *pcchValueActual)
 {
-    char *pcBuf = NULL;
-    int rc = VbglR3GuestPropReadValueAlloc(u32ClientId, pszName, &pcBuf);
+    char *pszBuf = NULL;
+    int rc = VbglR3GuestPropReadValueAlloc(u32ClientId, pszName, &pszBuf);
     if (RT_SUCCESS(rc))
     {
-        uint32_t cchValueActual = strlen(pcBuf) + 1;
-        if (cchValueActual > cchValue)
+        size_t cchValueActual = strlen(pszBuf) + 1;
+        if (cchValueActual <= cchValue)
+            memcpy(pszValue, pszBuf, cchValueActual);
+        else
         {
             if (pcchValueActual != NULL)
-                *pcchValueActual = cchValueActual;
+                *pcchValueActual = (uint32_t)cchValueActual;
             rc = VERR_BUFFER_OVERFLOW;
         }
-        if (RT_SUCCESS(rc))
-            strcpy(pszValue, pcBuf);
-    }
-    VbglR3GuestPropReadValueFree(pcBuf);
+    }
+    VbglR3GuestPropReadValueFree(pszBuf);
     return rc;
 }
@@ -495 +495 @@
     Msg.hdr.cParms = 3;
     /* Get the length of the patterns array... */
-    uint32_t cchPatterns = 0;
-    for (uint32_t cchCurrent = strlen(pszzPatterns); cchCurrent != 0;
+    size_t cchPatterns = 0;
+    for (size_t cchCurrent = strlen(pszzPatterns); cchCurrent != 0;
          cchCurrent = strlen(pszzPatterns + cchPatterns))
         cchPatterns += cchCurrent + 1;
     /* ...including the terminator. */
     ++cchPatterns;
-    VbglHGCMParmPtrSet(&Msg.patterns, const_cast<char *>(pszzPatterns),
-                       cchPatterns);
+    VbglHGCMParmPtrSet(&Msg.patterns, (char *)pszzPatterns, (uint32_t)cchPatterns);
     VbglHGCMParmPtrSet(&Msg.strings, pcBuf, cbBuf);
     VbglHGCMParmUInt32Set(&Msg.size, 0);
@@ -570 +569 @@
 
     /* Get the length of the pattern string, including the final terminator. */
-    uint32_t cchPatterns = 1;
-    for (unsigned i = 0; i < cPatterns; ++i)
+    size_t cchPatterns = 1;
+    for (uint32_t i = 0; i < cPatterns; ++i)
         cchPatterns += strlen(papszPatterns[i]) + 1;
 
@@ -577 +576 @@
     RTMemAutoPtr<char> Patterns;
     Patterns = (char *)RTMemAlloc(cchPatterns);
-    uint32_t iOffs = 0;
+    size_t off = 0;
     for (uint32_t i = 0; i < cPatterns; ++i)
     {
-        uint32_t cb = strlen(papszPatterns[i]) + 1;
-        memcpy(&Patterns[iOffs], papszPatterns[i], cb);
-        iOffs += cb;
-    }
-    Patterns[iOffs] = '\0';
+        size_t cb = strlen(papszPatterns[i]) + 1;
+        memcpy(&Patterns[off], papszPatterns[i], cb);
+        off += cb;
+    }
+    Patterns[off] = '\0';
 
     /* Randomly chosen initial size for the buffer to hold the enumeration
@@ -841 +840 @@
     Msg.hdr.info.u32Function = GET_NOTIFICATION;
     Msg.hdr.info.cParms = 4;
-    Msg.patterns.SetPtr(const_cast<char *>(pszPatterns),
-                        strlen(pszPatterns) + 1);
+    VbglHGCMParmPtrSetString(&Msg.patterns, pszPatterns);
     Msg.buffer.SetPtr(pvBuf, cbBuf);
     Msg.timestamp.SetUInt64(u64Timestamp);