Changeset 85121 in vbox for trunk/src/VBox/Storage/testcase

Timestamp:

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

Author:

vboxsync

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

139061

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/Storage/testcase

Files:

• VDIoBackend.h (modified) (1 diff)
• VDIoBackendMem.h (modified) (1 diff)
• VDScript.h (modified) (3 diffs)
• tstVD.cpp (modified) (1 diff)

trunk/src/VBox/Storage/testcase/VDIoBackend.h

@@ -44 +44 @@
  * @param   rcReq     Completion code for the request.
  */
-typedef DECLCALLBACK(int) FNVDIOCOMPLETE(void *pvUser, int rcReq);
+typedef DECLCALLBACKTYPE(int, FNVDIOCOMPLETE,(void *pvUser, int rcReq));
 /** Pointer to a completion handler. */
 typedef FNVDIOCOMPLETE *PFNVDIOCOMPLETE;

trunk/src/VBox/Storage/testcase/VDIoBackendMem.h

@@ -39 +39 @@
  * @param   rcReq     Completion code for the request.
  */
-typedef DECLCALLBACK(int) FNVDIOCOMPLETE(void *pvUser, int rcReq);
+typedef DECLCALLBACKTYPE(int, FNVDIOCOMPLETE,(void *pvUser, int rcReq));
 /** Pointer to a completion handler. */
 typedef FNVDIOCOMPLETE *PFNVDIOCOMPLETE;

trunk/src/VBox/Storage/testcase/VDScript.h

@@ -83 +83 @@
 
 /** Script callback. */
-typedef DECLCALLBACK(int) FNVDSCRIPTCALLBACK(PVDSCRIPTARG paScriptArgs, void *pvUser);
+typedef DECLCALLBACKTYPE(int, FNVDSCRIPTCALLBACK,(PVDSCRIPTARG paScriptArgs, void *pvUser));
 /** Pointer to a script callback. */
 typedef FNVDSCRIPTCALLBACK *PFNVDSCRIPTCALLBACK;
@@ -127 +127 @@
  * @param   cbRead         How much to read.
  */
-typedef DECLCALLBACK(int) FNVDSCRIPTASREAD(void *pvUser, VDSCRIPTARG Address, void *pvBuf, size_t cbRead);
+typedef DECLCALLBACKTYPE(int, FNVDSCRIPTASREAD,(void *pvUser, VDSCRIPTARG Address, void *pvBuf, size_t cbRead));
 /** Pointer to a read callback. */
 typedef FNVDSCRIPTASREAD *PFNVDSCRIPTASREAD;
@@ -141 +141 @@
  * @param   cbWrite        How much to write.
  */
-typedef DECLCALLBACK(int) FNVDSCRIPTASWRITE(void *pvUser, VDSCRIPTARG Address, const void *pvBuf, size_t cbWrite);
+typedef DECLCALLBACKTYPE(int, FNVDSCRIPTASWRITE,(void *pvUser, VDSCRIPTARG Address, const void *pvBuf, size_t cbWrite));
 /** Pointer to a write callback. */
 typedef FNVDSCRIPTASWRITE *PFNVDSCRIPTASWRITE;

trunk/src/VBox/Storage/testcase/tstVD.cpp

@@ -362 +362 @@
 }
 
-static int compareSegments(const void *left, const void *right)
+static int compareSegments(const void *left, const void *right) RT_NOTHROW_DEF
 {
     /* Note that no duplicates are allowed in the array being sorted. */