Changeset 85121 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jul 8, 2020 7:33:26 PM (5 years ago)

Author:

vboxsync

Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:

trunk/src/VBox/ValidationKit/utils

Files:

• cpu/cidet-app.cpp (modified) (3 diffs)
• cpu/cidet.h (modified) (8 diffs)
• serial/SerialTest.cpp (modified) (1 diff)
• usb/UsbTest.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp

@@ -186 +186 @@
 
 #ifdef RT_OS_WINDOWS
-static int CidetAppXcptFilter(EXCEPTION_POINTERS *pXcptPtrs)
+static int CidetAppXcptFilter(EXCEPTION_POINTERS *pXcptPtrs) RT_NOTHROW_DEF
 {
     /*
@@ -382 +382 @@
  * @param   pXcptPtrs   The exception record.
  */
-static LONG CALLBACK CidetAppVectoredXcptHandler(EXCEPTION_POINTERS *pXcptPtrs)
+static LONG CALLBACK CidetAppVectoredXcptHandler(EXCEPTION_POINTERS *pXcptPtrs) RT_NOTHROW_DEF
 {
     RTStrmPrintf(g_pStdErr, "CidetAppVectoredXcptHandler!\n");
@@ -398 +398 @@
  * @param   pXcptPtrs   The exception record.
  */
-static LONG CALLBACK CidetAppUnhandledXcptFilter(EXCEPTION_POINTERS *pXcptPtrs)
+static LONG CALLBACK CidetAppUnhandledXcptFilter(EXCEPTION_POINTERS *pXcptPtrs) RT_NOTHROW_DEF
 {
     RTStrmPrintf(g_pStdErr, "CidetAppUnhandledXcptFilter!\n");

trunk/src/VBox/ValidationKit/utils/cpu/cidet.h

@@ -121 +121 @@
  *                          cause exceptions/faults.
  */
-typedef DECLCALLBACK(int) FNCIDETSETUPINOUT(struct CIDETCORE *pThis, bool fInvalid);
+typedef DECLCALLBACKTYPE(int, FNCIDETSETUPINOUT,(struct CIDETCORE *pThis, bool fInvalid));
 /** Pointer to a FNCIDETSETUPINOUT function. */
 typedef FNCIDETSETUPINOUT *PFNCIDETSETUPINOUT;
@@ -807 +807 @@
      * @param   pBuf            Pointer to the buffer structure.
      */
-    DECLCALLBACKMEMBER(bool, pfnReInitDataBuf)(struct CIDETCORE *pThis, PCIDETBUF pBuf);
+    DECLCALLBACKMEMBER(bool, pfnReInitDataBuf,(struct CIDETCORE *pThis, PCIDETBUF pBuf));
 
     /**
@@ -818 +818 @@
      *                          given in pfnReinitBuf call).
      */
-    DECLCALLBACKMEMBER(bool, pfnSetupDataBuf)(struct CIDETCORE *pThis, PCIDETBUF pBuf, void const *pvSrc);
+    DECLCALLBACKMEMBER(bool, pfnSetupDataBuf,(struct CIDETCORE *pThis, PCIDETBUF pBuf, void const *pvSrc));
 
     /**
@@ -834 +834 @@
      *                          buffer offset given in pfnReinitBuf call).
      */
-    DECLCALLBACKMEMBER(bool, pfnIsBufEqual)(struct CIDETCORE *pThis, struct CIDETBUF *pBuf, void const *pvExpected);
+    DECLCALLBACKMEMBER(bool, pfnIsBufEqual,(struct CIDETCORE *pThis, struct CIDETBUF *pBuf, void const *pvExpected));
 
     /**
@@ -845 +845 @@
      *                          execute.
      */
-    DECLCALLBACKMEMBER(bool, pfnReInitCodeBuf)(struct CIDETCORE *pThis, PCIDETBUF pBuf);
+    DECLCALLBACKMEMBER(bool, pfnReInitCodeBuf,(struct CIDETCORE *pThis, PCIDETBUF pBuf));
 
     /**
@@ -855 +855 @@
      * @param   pvInstr         Pointer to the encoded instruction bytes.
      */
-    DECLCALLBACKMEMBER(bool, pfnSetupCodeBuf)(struct CIDETCORE *pThis, PCIDETBUF pBuf, void const *pvInstr);
+    DECLCALLBACKMEMBER(bool, pfnSetupCodeBuf,(struct CIDETCORE *pThis, PCIDETBUF pBuf, void const *pvInstr));
 
     /**
@@ -863 +863 @@
      * @param   pThis           Pointer to the core structure.
      */
-    DECLCALLBACKMEMBER(bool, pfnExecute)(struct CIDETCORE *pThis);
+    DECLCALLBACKMEMBER(bool, pfnExecute,(struct CIDETCORE *pThis));
 
     /**
@@ -872 +872 @@
      * @param   va              Arguments referenced in @a pszFormat.
      */
-    DECLCALLBACKMEMBER(void, pfnFailure)(struct CIDETCORE *pThis, const char *pszFormat, va_list va);
+    DECLCALLBACKMEMBER(void, pfnFailure,(struct CIDETCORE *pThis, const char *pszFormat, va_list va));
 
     /** Array of indexes for use by FNCIDETSETUPINOUT.

trunk/src/VBox/ValidationKit/utils/serial/SerialTest.cpp

@@ -83 +83 @@
  * @param   pSerialTest         The serial test instance data.
  */
-typedef DECLCALLBACK(int) FNSERIALTESTRUN(PSERIALTEST pSerialTest);
+typedef DECLCALLBACKTYPE(int, FNSERIALTESTRUN,(PSERIALTEST pSerialTest));
 /** Pointer to the serial test callback. */
 typedef FNSERIALTESTRUN *PFNSERIALTESTRUN;

trunk/src/VBox/ValidationKit/utils/usb/UsbTest.cpp

@@ -122 +122 @@
  * @param   pParams         The USB test parameters to set up.
  */
-typedef DECLCALLBACK(int) FNUSBTESTPARAMSSETUP(unsigned idxTest, const char *pszTest, PUSBTESTPARAMS pParams);
+typedef DECLCALLBACKTYPE(int, FNUSBTESTPARAMSSETUP,(unsigned idxTest, const char *pszTest, PUSBTESTPARAMS pParams));
 /** Pointer to a USB test parameters setup callback. */
 typedef FNUSBTESTPARAMSSETUP *PFNUSBTESTPARAMSSETUP;