Changeset 85121 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

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

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -60 +60 @@
 # define AssertMsg(expr, msg) do{}while (0)
 #endif
-static LOG_ROUTINE g_Logger = NULL;
-
-static VOID DoLogging(LPCSTR szString, ...);
+static PFNVBOXNETCFGLOGGER volatile g_pfnLogger = NULL;
+
+static void DoLogging(const char *pszString, ...);
 #define NonStandardLog DoLogging
 #define NonStandardLogFlow(x) DoLogging x
@@ -865 +865 @@
  * logging
  */
-static VOID DoLogging(LPCSTR szString, ...)
-{
-    LOG_ROUTINE pfnRoutine = (LOG_ROUTINE)(*((void * volatile *)&g_Logger));
-    if (pfnRoutine)
+static void DoLogging(const char *pszString, ...)
+{
+    PFNVBOXNETCFGLOGGER pfnLogger = g_pfnLogger;
+    if (pfnLogger)
     {
         char szBuffer[4096] = {0};
         va_list va;
-        va_start(va, szString);
-        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, va);
+        va_start(va, pszString);
+        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), pszString, va);
         va_end(va);
 
-        pfnRoutine(szBuffer);
-    }
-}
-
-VBOXNETCFGWIN_DECL(VOID) VBoxNetCfgWinSetLogging(IN LOG_ROUTINE pfnLog)
-{
-    *((void * volatile *)&g_Logger) = pfnLog;
+        pfnLogger(szBuffer);
+    }
+}
+
+VBOXNETCFGWIN_DECL(void) VBoxNetCfgWinSetLogging(IN PFNVBOXNETCFGLOGGER pfnLogger)
+{
+    g_pfnLogger = pfnLogger;
 }