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

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

Files:

• Makefile.kmk (modified) (1 diff)
• cbinding/capiidl.xsl (modified) (1 diff)
• glue/initterm.cpp (modified) (2 diffs)
• include/DisplayImpl.h (modified) (1 diff)
• include/GuestDnDPrivate.h (modified) (1 diff)
• include/HGCMThread.h (modified) (4 diffs)
• include/MachineDebuggerImpl.h (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)
• src-all/DisplayPNGUtil.cpp (modified) (3 diffs)
• src-client/DisplayImpl.cpp (modified) (3 diffs)
• src-client/HGCMThread.cpp (modified) (4 diffs)
• src-client/UsbCardReader.cpp (modified) (1 diff)
• src-server/HostVideoInputDeviceImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• src-server/win/svcmain.cpp (modified) (3 diffs)
• webservice/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -1443 +1443 @@
                 '# pragma warning(disable:4005)' \
                 '#endif' \
+                '#if _MSC_VER >= 1900 /* RT_MSC_VER_VC140 */' \
+                '# pragma warning(disable:5039)' \
+                '#endif' \
                ''
         $(QUIET)$(CAT_EXT) "$1.tmp" >> "$1"

trunk/src/VBox/Main/cbinding/capiidl.xsl

@@ -96 +96 @@
 
 #ifdef _WIN32
-# pragma warning(push)
-# pragma warning(disable:4668 4255) /* -Wall and windows.h */
-# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
-#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
+# ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable:4668 4255) /* -Wall and windows.h */
+#  if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
+#   pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
+#  endif
+#  ifdef __cplusplus
+#   if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
+#    pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
+#   endif
+#  endif
 # endif
 # undef COBJMACROS

trunk/src/VBox/Main/glue/initterm.cpp

@@ -201 +201 @@
  * Replacement function for the InvokeStub method for the IRundown stub.
  */
-static HRESULT STDMETHODCALLTYPE Rundown_InvokeStub(IRpcStubBuffer *pThis, RPCOLEMESSAGE *pMsg, IRpcChannelBuffer *pBuf)
+static HRESULT STDMETHODCALLTYPE
+Rundown_InvokeStub(IRpcStubBuffer *pThis, RPCOLEMESSAGE *pMsg, IRpcChannelBuffer *pBuf) RT_NOTHROW_DEF
 {
     /*
@@ -422 +423 @@
                     {
                         void *pv;
-                        DECLCALLBACKMEMBER(uint32_t, pfnRegUpdate)(void);
+                        DECLCALLBACKMEMBER(uint32_t, pfnRegUpdate,(void));
                     } u;
                     vrc = RTLdrGetSymbol(hMod, "VbpsUpdateRegistrations", &u.pv);

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,

trunk/src/VBox/Main/src-all/DisplayPNGUtil.cpp

@@ -33 +33 @@
 } PNGWriteCtx;
 
-static void PNGAPI png_write_data_fn(png_structp png_ptr, png_bytep p, png_size_t cb)
+static void PNGAPI png_write_data_fn(png_structp png_ptr, png_bytep p, png_size_t cb) RT_NOTHROW_DEF
 {
     PNGWriteCtx *pCtx = (PNGWriteCtx *)png_get_io_ptr(png_ptr);
@@ -62 +62 @@
 }
 
-static void PNGAPI png_output_flush_fn(png_structp png_ptr)
+static void PNGAPI png_output_flush_fn(png_structp png_ptr) RT_NOTHROW_DEF
 {
     NOREF(png_ptr);
@@ -144 +144 @@
                 if (info_ptr)
                 {
+#if RT_MSC_PREREQ(RT_MSC_VER_VC140)
+#pragma warning(push,3)
                     if (!setjmp(png_jmpbuf(png_ptr)))
+#pragma warning(pop)
+#else
+                    if (!setjmp(png_jmpbuf(png_ptr)))
+#endif
                     {
                         PNGWriteCtx ctx;

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);

trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp

@@ -119 +119 @@
 
 /** @todo These typedefs must be in a header. */
-typedef DECLCALLBACK(int) FNVBOXHOSTWEBCAMADD(void *pvUser,
-                                              const char *pszName,
-                                              const char *pszPath,
-                                              const char *pszAlias,
-                                              uint64_t *pu64Result);
+typedef DECLCALLBACKTYPE(int, FNVBOXHOSTWEBCAMADD,(void *pvUser,
+                                                   const char *pszName,
+                                                   const char *pszPath,
+                                                   const char *pszAlias,
+                                                   uint64_t *pu64Result));
 typedef FNVBOXHOSTWEBCAMADD *PFNVBOXHOSTWEBCAMADD;
 
-typedef DECLCALLBACK(int) FNVBOXHOSTWEBCAMLIST(PFNVBOXHOSTWEBCAMADD pfnWebcamAdd,
-                                               void *pvUser,
-                                               uint64_t *pu64WebcamAddResult);
+typedef DECLCALLBACKTYPE(int, FNVBOXHOSTWEBCAMLIST,(PFNVBOXHOSTWEBCAMADD pfnWebcamAdd,
+                                                    void *pvUser,
+                                                    uint64_t *pu64WebcamAddResult));
 typedef FNVBOXHOSTWEBCAMLIST *PFNVBOXHOSTWEBCAMLIST;
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1844 +1844 @@
 
 #ifdef DEBUG
+typedef DECLCALLBACKTYPE(void, FNTESTPRINTF,(const char *, ...));
 /** Simple unit test/operation examples for sanitiseMachineFilename(). */
-static unsigned testSanitiseMachineFilename(DECLCALLBACKMEMBER(void, pfnPrintf)(const char *, ...))
+static unsigned testSanitiseMachineFilename(FNTESTPRINTF *pfnPrintf)
 {
     unsigned cErrors = 0;

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -97 +97 @@
 
 /** Passed to CreateThread to monitor the shutdown event. */
-static DWORD WINAPI MonitorProc(void *pv)
+static DWORD WINAPI MonitorProc(void *pv) RT_NOTHROW_DEF
 {
     CExeModule *p = (CExeModule *)pv;
@@ -594 +594 @@
 static BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason)
 {
+    typedef DECLCALLBACKPTR_EX(BOOL, WINAPI, PFNSHUTDOWNBLOCKREASONCREATE,(HWND hWnd, LPCWSTR pwszReason));
+
+    PFNSHUTDOWNBLOCKREASONCREATE pfn
+        = (PFNSHUTDOWNBLOCKREASONCREATE)GetProcAddress(GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonCreate");
+    AssertPtr(pfn);
+
     BOOL fResult = FALSE;
-    typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONCREATE)(HWND hWnd, LPCWSTR pwszReason);
-
-    PFNSHUTDOWNBLOCKREASONCREATE pfn = (PFNSHUTDOWNBLOCKREASONCREATE)GetProcAddress(
-            GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonCreate");
-    AssertPtr(pfn);
     if (pfn)
         fResult = pfn(hWnd, pwszReason);
@@ -611 +612 @@
 static BOOL ShutdownBlockReasonDestroyAPI(HWND hWnd)
 {
+    typedef DECLCALLBACKPTR_EX(BOOL, WINAPI, PFNSHUTDOWNBLOCKREASONDESTROY,(HWND hWnd));
+    PFNSHUTDOWNBLOCKREASONDESTROY pfn
+        = (PFNSHUTDOWNBLOCKREASONDESTROY)GetProcAddress(GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonDestroy");
+    AssertPtr(pfn);
+
     BOOL fResult = FALSE;
-    typedef BOOL(WINAPI *PFNSHUTDOWNBLOCKREASONDESTROY)(HWND hWnd);
-
-    PFNSHUTDOWNBLOCKREASONDESTROY pfn = (PFNSHUTDOWNBLOCKREASONDESTROY)GetProcAddress(
-        GetModuleHandle(L"User32.dll"), "ShutdownBlockReasonDestroy");
-    AssertPtr(pfn);
     if (pfn)
         fResult = pfn(hWnd);

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -219 +219 @@
  # -wd4774: string(532): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
  # -wd4458: stdsoap2.h(2644): warning C4458: declaration of 'type' hides class member
+ # -wd5039: x509v3.h(883): warning C5039: 'OPENSSL_sk_set_cmp_func': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
  # soapc-1.cpp(182) : warning C4883: 'soap_getelement': function size suppresses optimizations
- TEMPLATE_VBOXWEBR3EXE_CXXFLAGS.win = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win) -wd4774 -wd4458 -wd4883
+ TEMPLATE_VBOXWEBR3EXE_CXXFLAGS.win = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win) -wd4774 -wd4458 -wd4883 -wd5039
 endif
 
@@ -389 +390 @@
   vboxwebsrv_CXXFLAGS.win += -wd4774 # string(532): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal
   vboxwebsrv_CXXFLAGS.win += -wd4458 # stdsoap2.h(2644): warning C4458: declaration of 'type' hides class member
+  vboxwebsrv_CXXFLAGS.win += -wd5039 # x509v3.h(883): warning C5039: 'OPENSSL_sk_set_cmp_func': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
  endif
  ifn1of ($(KBUILD_TARGET), win)