Changeset 85121 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 8, 2020 7:33:26 PM (4 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/Main/include

Files:

• DisplayImpl.h (modified) (1 diff)
• GuestDnDPrivate.h (modified) (1 diff)
• HGCMThread.h (modified) (4 diffs)
• MachineDebuggerImpl.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -410 +410 @@
 public:
 
-    static int i_displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppbData, size_t *pcbData,
-                                          uint32_t *pcx, uint32_t *pcy, bool *pfMemFree);
+    static DECLCALLBACK(int) i_displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppbData, size_t *pcbData,
+                                                        uint32_t *pcx, uint32_t *pcy, bool *pfMemFree);
 
 private:
-    static int i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll);
-    static int i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
+    static DECLCALLBACK(int) i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll);
+    static DECLCALLBACK(int) i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y,
+                                               ULONG width, ULONG height);
 
     void i_updateGuestGraphicsFacility(void);

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -953 +953 @@
 
 /** Guest DnD callback function definition. */
-typedef DECLCALLBACKPTR(int, PFNGUESTDNDCALLBACK) (uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
+typedef DECLCALLBACKPTR(int, PFNGUESTDNDCALLBACK,(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser));
 
 /**

trunk/src/VBox/Main/include/HGCMThread.h

@@ -55 +55 @@
  *         (shouldn't happen).
  */
-typedef DECLCALLBACK(int) HGCMMSGCALLBACK(int32_t result, HGCMMsgCore *pMsgCore);
+typedef DECLCALLBACKTYPE(int, FNHGCMMSGCALLBACK,(int32_t result, HGCMMsgCore *pMsgCore));
 /** Pointer to a message completeion callback function. */
-typedef HGCMMSGCALLBACK *PHGCMMSGCALLBACK;
+typedef FNHGCMMSGCALLBACK *PFNHGCMMSGCALLBACK;
 
 
@@ -76 +76 @@
 
         /** Callback function pointer. */
-        PHGCMMSGCALLBACK m_pfnCallback;
+        PFNHGCMMSGCALLBACK m_pfnCallback;
 
         /** Next element in a message queue. */
@@ -115 +115 @@
  *  @param pvUser        User specified thread parameter.
  */
-typedef DECLCALLBACK(void) FNHGCMTHREAD(HGCMThread *pThread, void *pvUser);
+typedef DECLCALLBACKTYPE(void, FNHGCMTHREAD,(HGCMThread *pThread, void *pvUser));
 typedef FNHGCMTHREAD *PFNHGCMTHREAD;
 
@@ -179 +179 @@
  * @thread any
  */
-int hgcmMsgPost(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback);
+int hgcmMsgPost(HGCMMsgCore *pMsg, PFNHGCMMSGCALLBACK pfnCallback);
 
 /** Send a message to HGCM worker thread.

trunk/src/VBox/Main/include/MachineDebuggerImpl.h

@@ -141 +141 @@
 
     /** RTLogGetFlags, RTLogGetGroupSettings and RTLogGetDestinations function. */
-    typedef DECLCALLBACK(int) FNLOGGETSTR(PRTLOGGER, char *, size_t);
+    typedef DECLCALLBACKTYPE(int, FNLOGGETSTR,(PRTLOGGER, char *, size_t));
     /** Function pointer.  */
     typedef FNLOGGETSTR *PFNLOGGETSTR;

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -146 +146 @@
 
 #ifdef RT_OS_WINDOWS
-    typedef DECLCALLBACKPTR(HRESULT, SVCHelperClientFunc)
-        (SVCHlpClient *aClient, Progress *aProgress, void *aUser, int *aVrc);
+    typedef DECLCALLBACKPTR(HRESULT, SVCHelperClientFunc,(SVCHlpClient *aClient, Progress *aProgress, void *aUser, int *aVrc));
     HRESULT i_startSVCHelperClient(bool aPrivileged,
                                    SVCHelperClientFunc aFunc,