Changeset 85121 in vbox for trunk/src/VBox/Main/src-client

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/Main/src-client

Files:

• DisplayImpl.cpp (modified) (3 diffs)
• HGCMThread.cpp (modified) (4 diffs)
• UsbCardReader.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -1763 +1763 @@
 }
 
-/* static */
-int Display::i_displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppbData, size_t *pcbData,
-                                        uint32_t *pcx, uint32_t *pcy, bool *pfMemFree)
+/*static*/ DECLCALLBACK(int)
+Display::i_displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppbData, size_t *pcbData,
+                                    uint32_t *pcx, uint32_t *pcy, bool *pfMemFree)
 {
     int rc;
@@ -2147 +2147 @@
 #endif /* VBOX_WITH_RECORDING */
 
-int Display::i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address,
-                               ULONG x, ULONG y, ULONG width, ULONG height)
+/*static*/ DECLCALLBACK(int)
+Display::i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height)
 {
     int rc = VINF_SUCCESS;
@@ -2312 +2312 @@
 }
 
-int Display::i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
+/*static*/ DECLCALLBACK(int) Display::i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
 {
     LogRelFlowFunc(("uId=%d, fUpdateAll %d\n", uId, fUpdateAll));

trunk/src/VBox/Main/src-client/HGCMThread.cpp

@@ -146 +146 @@
         int MsgAlloc(HGCMMsgCore **pMsg, uint32_t u32MsgId, PFNHGCMNEWMSGALLOC pfnNewMessage);
         int MsgGet(HGCMMsgCore **ppMsg);
-        int MsgPost(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback, bool bWait);
+        int MsgPost(HGCMMsgCore *pMsg, PFNHGCMMSGCALLBACK pfnCallback, bool bWait);
         int MsgComplete(HGCMMsgCore *pMsg, int32_t result);
 };
@@ -400 +400 @@
 }
 
-int HGCMThread::MsgPost(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback, bool fWait)
+int HGCMThread::MsgPost(HGCMMsgCore *pMsg, PFNHGCMMSGCALLBACK pfnCallback, bool fWait)
 {
     LogFlow(("HGCMThread::MsgPost: thread = %p, pMsg = %p, pfnCallback = %p\n", this, pMsg, pfnCallback));
@@ -694 +694 @@
 }
 
-DECLINLINE(int) hgcmMsgPostInternal(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback, bool fWait)
+DECLINLINE(int) hgcmMsgPostInternal(HGCMMsgCore *pMsg, PFNHGCMMSGCALLBACK pfnCallback, bool fWait)
 {
     LogFlow(("MAIN::hgcmMsgPostInternal: pMsg = %p, pfnCallback = %p, fWait = %d\n", pMsg, pfnCallback, fWait));
@@ -709 +709 @@
 }
 
-int hgcmMsgPost(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback)
+int hgcmMsgPost(HGCMMsgCore *pMsg, PFNHGCMMSGCALLBACK pfnCallback)
 {
     int rc = hgcmMsgPostInternal(pMsg, pfnCallback, false);

trunk/src/VBox/Main/src-client/UsbCardReader.cpp

@@ -595 +595 @@
 }
 
-static int drvCardReaderWakeupFunc(PUSBCARDREADER pThis)
+static DECLCALLBACK(int) drvCardReaderWakeupFunc(PUSBCARDREADER pThis)
 {
     NOREF(pThis);