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

Timestamp:

Jul 8, 2020 7:33:26 PM (5 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/Installer/win

Files:

• InstallHelper/VBoxInstallHelper.cpp (modified) (3 diffs)
• Stub/VBoxStub.cpp (modified) (1 diff)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -525 +525 @@
 }
 
-static VOID netCfgLoggerCallback(LPCSTR szString)
+static DECLCALLBACK(void) netCfgLoggerCallback(const char *pszString)
 {
     if (g_hCurrentModule)
-        logString(g_hCurrentModule, szString);
+        logString(g_hCurrentModule, pszString);
 }
 
@@ -535 +535 @@
     if (g_hCurrentModule)
     {
-        VBoxNetCfgWinSetLogging((LOG_ROUTINE)NULL);
+        VBoxNetCfgWinSetLogging(NULL);
         g_hCurrentModule = NULL;
     }
@@ -549 +549 @@
     g_hCurrentModule = hModule;
 
-    VBoxNetCfgWinSetLogging((LOG_ROUTINE)netCfgLoggerCallback);
+    VBoxNetCfgWinSetLogging(netCfgLoggerCallback);
     /* uncomment next line if you want to add logging information from VBoxDrvCfg.cpp */
 //    VBoxDrvCfgLoggerSet(vboxDrvLoggerCallback, NULL);

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -26 +26 @@
 
 #include <iprt/win/windows.h>
-#include <commctrl.h>
+#include <iprt/win/commctrl.h>
 #include <fcntl.h>
 #include <io.h>