Changeset 98217 in vbox for trunk/include

Timestamp:

Jan 22, 2023 11:01:16 PM (2 years ago)

Author:

vboxsync

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

155406

Message:

VMMDevCoreTypes.h: Follow up to r155045 (Made HGCMFunctionParameter.GetUInt32/64 return VERR_WRONG_PARAMETER_TYPE instead of VERR_INVALID_PARAMETER (a tiny bit risky)) applying it to the two other copies of the stupid code.

File:

• trunk/include/VBox/VMMDevCoreTypes.h (modified) (6 diffs)

trunk/include/VBox/VMMDevCoreTypes.h

@@ -336 +336 @@
     int GetUInt32(uint32_t RT_FAR *pu32)
     {
-        if (type == VMMDevHGCMParmType_32bit)
-        {
-            *pu32 = u.value32;
-            return VINF_SUCCESS;
-        }
-        return VERR_INVALID_PARAMETER;
+        AssertMsgReturnStmt(type == VMMDevHGCMParmType_32bit, ("type=%d\n", type),
+                            *pu32 = UINT32_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
+        *pu32 = u.value32;
+        return VINF_SUCCESS;
     }
 
@@ -352 +350 @@
     int GetUInt64(uint64_t RT_FAR *pu64)
     {
-        if (type == VMMDevHGCMParmType_64bit)
-        {
-            *pu64 = u.value64;
-            return VINF_SUCCESS;
-        }
-        return VERR_INVALID_PARAMETER;
+        AssertMsgReturnStmt(type == VMMDevHGCMParmType_64bit, ("type=%d\n", type),
+                            *pu64 = UINT64_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
+        *pu64 = u.value64;
+        return VINF_SUCCESS;
     }
 
@@ -420 +416 @@
     int GetUInt32(uint32_t RT_FAR *pu32)
     {
-        if (type == VMMDevHGCMParmType_32bit)
-        {
-            *pu32 = u.value32;
-            return VINF_SUCCESS;
-        }
-        return VERR_INVALID_PARAMETER;
+        AssertMsgReturnStmt(type == VMMDevHGCMParmType_32bit, ("type=%d\n", type),
+                            *pu32 = UINT32_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
+        *pu32 = u.value32;
+        return VINF_SUCCESS;
     }
 
@@ -436 +430 @@
     int GetUInt64(uint64_t RT_FAR *pu64)
     {
-        if (type == VMMDevHGCMParmType_64bit)
-        {
-            *pu64 = u.value64;
-            return VINF_SUCCESS;
-        }
-        return VERR_INVALID_PARAMETER;
+        AssertMsgReturnStmt(type == VMMDevHGCMParmType_64bit, ("type=%d\n", type),
+                            *pu64 = UINT64_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
+        *pu64 = u.value64;
+        return VINF_SUCCESS;
     }
 
@@ -519 +511 @@
     int GetUInt32(uint32_t *pu32)
     {
-        AssertMsgReturnStmt(type == VMMDevHGCMParmType_32bit, ("type=-%d\n", type),
+        AssertMsgReturnStmt(type == VMMDevHGCMParmType_32bit, ("type=%d\n", type),
                             *pu32 = UINT32_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE)
         *pu32 = u.value32;
@@ -534 +526 @@
     {
         AssertMsgReturnStmt(type == VMMDevHGCMParmType_64bit, ("type=%d\n", type),
-                            *pu64 = UINT32_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
+                            *pu64 = UINT64_MAX /* shut up gcc */, VERR_WRONG_PARAMETER_TYPE);
         *pu64 = u.value64;
         return VINF_SUCCESS;