Changeset 70938 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 9, 2018 5:32:07 PM (7 years ago)

Author:

vboxsync

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

120779

Message:

DevVGA-SVGA3d: FLOAT_FMT_ARGS fix for negative values. Fixed formatting bug in vmsvga3dInfoContextWorkerOne.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-cocoa.m (modified) (1 diff)
• DevVGA-SVGA3d-info.cpp (modified) (1 diff)
• DevVGA-SVGA3d.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m

@@ -48 +48 @@
 /**@def FLOAT_FMT_STR
  * Format string bits to go with FLOAT_FMT_ARGS. */
-#define FLOAT_FMT_STR                           "%d.%06d"
+#define FLOAT_FMT_STR                           "%d.%06u"
 /** @def FLOAT_FMT_ARGS
  * Format arguments for a float value, corresponding to FLOAT_FMT_STR.
  * @param   r       The floating point value to format.  */
-#define FLOAT_FMT_ARGS(r)                       (int)(r), ((unsigned)((r) * 1000000) % 1000000U)
+#define FLOAT_FMT_ARGS(r)                       (int)(r), ((unsigned)(RT_ABS(r) * 1000000) % 1000000U)
 
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -1694 +1694 @@
                     pHlp->pfnPrintf(pHlp, "%s[%#x(%u)] = [" FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR "] ctype=FLOAT\n",
                                     pszName, i, i,
-                                    FLOAT_FMT_ARGS(paConsts[i].value[0]), FLOAT_FMT_ARGS(paConsts[i].value[1]),
-                                    FLOAT_FMT_ARGS(paConsts[i].value[2]), FLOAT_FMT_ARGS(paConsts[i].value[3]));
+                                    FLOAT_FMT_ARGS(*(float *)&paConsts[i].value[0]), FLOAT_FMT_ARGS(*(float *)&paConsts[i].value[1]),
+                                    FLOAT_FMT_ARGS(*(float *)&paConsts[i].value[2]), FLOAT_FMT_ARGS(*(float *)&paConsts[i].value[3]));
                 else
                     pHlp->pfnPrintf(pHlp, "%s[%#x(%u)] = [%#x, %#x, %#x, %#x] ctype=%s\n",

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h

@@ -42 +42 @@
 /**@def FLOAT_FMT_STR
  * Format string bits to go with FLOAT_FMT_ARGS. */
-#define FLOAT_FMT_STR                           "%d.%06d"
+#define FLOAT_FMT_STR                           "%d.%06u"
 /** @def FLOAT_FMT_ARGS
  * Format arguments for a float value, corresponding to FLOAT_FMT_STR.
  * @param   r       The floating point value to format.  */
-#define FLOAT_FMT_ARGS(r)                       (int)(r), ((unsigned)((r) * 1000000) % 1000000U)
+#define FLOAT_FMT_ARGS(r)                       (int)(r), ((unsigned)(RT_ABS(r) * 1000000) % 1000000U)