Changeset 85121 in vbox for trunk/src/VBox/Runtime/r3

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/Runtime/r3

Files:

• init.cpp (modified) (1 diff)
• win/internal-r3-win.h (modified) (1 diff)
• win/process-win.cpp (modified) (1 diff)
• win/thread-win.cpp (modified) (2 diffs)
• xml.cpp (modified) (11 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -151 +151 @@
  * termination callback chain.
  */
-static void rtR3ExitCallback(void)
+static void rtR3ExitCallback(void) RT_NOTHROW_DEF
 {
     ASMAtomicWriteBool(&g_frtAtExitCalled, true);

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -136 +136 @@
 typedef int             (WINAPI *PFNWSAENUMNETWORKEVENTS)(UINT_PTR, HANDLE, struct _WSANETWORKEVENTS *);
 /** WSASend */
-typedef int             (WINAPI *PFNWSASend)(UINT_PTR, struct _WSABUF *, DWORD, LPDWORD, DWORD dwFlags, struct _OVERLAPPED *, PFNRT /*LPWSAOVERLAPPED_COMPLETION_ROUTINE*/);
+typedef int             (WINAPI *PFNWSASend)(UINT_PTR, struct _WSABUF *, DWORD, LPDWORD, DWORD dwFlags, struct _OVERLAPPED *, uintptr_t /*LPWSAOVERLAPPED_COMPLETION_ROUTINE*/);
 
 /** socket */

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -2076 +2076 @@
             rc = RTErrConvertFromWin32(dwErr);
             if (rc == VERR_UNRESOLVED_ERROR)
-                LogRelFunc(("CreateProcessWithLogonW (%p) failed: dwErr=%u (%#x), rc=%Rrc\n",
-                            g_pfnCreateProcessWithLogonW, dwErr, dwErr, rc));
+                LogRelFunc(("CreateProcessWithLogonW failed: dwErr=%u (%#x), rc=%Rrc\n", dwErr, dwErr, rc));
         }
         if (pwszzBlock)

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -59 +59 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static unsigned __stdcall rtThreadNativeMain(void *pvArgs);
+static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_PROTO;
 static void rtThreadWinTellDebuggerThreadName(uint32_t idThread, const char *pszName);
 
@@ -243 +243 @@
  * Wrapper which unpacks the param stuff and calls thread function.
  */
-static unsigned __stdcall rtThreadNativeMain(void *pvArgs)
+static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_DEF
 {
     DWORD           dwThreadId = GetCurrentThreadId();

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -385 +385 @@
 struct GlobalLock::Data
 {
-    PFNEXTERNALENTITYLOADER pOldLoader;
+    PFNEXTERNALENTITYLOADER pfnOldLoader;
     RTCLock lock;
 
     Data()
-        : pOldLoader(NULL),
-          lock(gGlobal.sxml.lock)
+        : pfnOldLoader(NULL)
+        , lock(gGlobal.sxml.lock)
     {
     }
@@ -402 +402 @@
 GlobalLock::~GlobalLock()
 {
-    if (m->pOldLoader)
-        xmlSetExternalEntityLoader(m->pOldLoader);
+    if (m->pfnOldLoader)
+        xmlSetExternalEntityLoader(m->pfnOldLoader);
     delete m;
     m = NULL;
 }
 
-void GlobalLock::setExternalEntityLoader(PFNEXTERNALENTITYLOADER pLoader)
-{
-    m->pOldLoader = xmlGetExternalEntityLoader();
-    xmlSetExternalEntityLoader(pLoader);
+void GlobalLock::setExternalEntityLoader(PFNEXTERNALENTITYLOADER pfnLoader)
+{
+    m->pfnOldLoader = xmlGetExternalEntityLoader();
+    xmlSetExternalEntityLoader(pfnLoader);
 }
 
@@ -1824 +1824 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...)
+static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NOTHROW_DEF
 {
     NOREF(pCtx);
@@ -1833 +1833 @@
 }
 
-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error)
+static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF
 {
     NOREF(pCtx);
@@ -2018 +2018 @@
 }
 
-/*static*/ int XmlStringWriter::WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite)
+/*static*/ int XmlStringWriter::WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_DEF
 {
     if (cbToWrite > 0)
@@ -2026 +2026 @@
 }
 
-/*static*/ int XmlStringWriter::WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite)
+/*static*/ int XmlStringWriter::WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_DEF
 {
     XmlStringWriter *pThis = static_cast<XmlStringWriter*>(pvUser);
@@ -2048 +2048 @@
 }
 
-int XmlStringWriter::CloseCallback(void *pvUser)
+/*static*/ int XmlStringWriter::CloseCallback(void *pvUser) RT_NOTHROW_DEF
 {
     /* Nothing to do here. */
@@ -2173 +2173 @@
 }
 
-// static
-int XmlFileParser::ReadCallback(void *aCtxt, char *aBuf, int aLen)
+/*static*/ int XmlFileParser::ReadCallback(void *aCtxt, char *aBuf, int aLen) RT_NOTHROW_DEF
 {
     ReadContext *pContext = static_cast<ReadContext*>(aCtxt);
@@ -2193 +2192 @@
 }
 
-int XmlFileParser::CloseCallback(void *aCtxt)
+/*static*/ int XmlFileParser::CloseCallback(void *aCtxt) RT_NOTHROW_DEF
 {
     /// @todo to be written
@@ -2301 +2300 @@
 }
 
-int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen)
+/*static*/ int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen) RT_NOTHROW_DEF
 {
     WriteContext *pContext = static_cast<WriteContext*>(aCtxt);
@@ -2319 +2318 @@
 }
 
-int XmlFileWriter::CloseCallback(void *aCtxt)
+/*static*/ int XmlFileWriter::CloseCallback(void *aCtxt) RT_NOTHROW_DEF
 {
     /// @todo to be written