Changeset 85121 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools

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/HostDrivers/VBoxNetFlt/win/tools

Files:

• VBoxNetAdpInstall.cpp (modified) (1 diff)
• VBoxNetAdpUninstall.cpp (modified) (1 diff)
• VBoxNetFltInstall.cpp (modified) (1 diff)
• VBoxNetFltUninstall.cpp (modified) (1 diff)
• VBoxNetLwfInstall.cpp (modified) (1 diff)
• VBoxNetLwfUninstall.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

@@ -48 +48 @@
 
 
-static VOID winNetCfgLogger(LPCSTR szString)
-{
-    printf("%s\n", szString);
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
+{
+    printf("%s\n", pszString);
 }
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp

@@ -37 +37 @@
 #endif
 
-static VOID winNetCfgLogger(LPCSTR szString)
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", szString);
+    printf("%s", pszString);
 }
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp

@@ -36 +36 @@
 
 
-static VOID winNetCfgLogger(LPCSTR szString)
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", szString);
+    printf("%s", pszString);
 }
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp

@@ -34 +34 @@
 #define VBOX_NETFLT_RETRIES 10
 
-static VOID winNetCfgLogger(LPCSTR szString)
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", szString);
+    printf("%s", pszString);
 }
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp

@@ -34 +34 @@
 
 
-static VOID winNetCfgLogger(LPCSTR pszString)
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
     printf("%s", pszString);

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp

@@ -31 +31 @@
 #define VBOX_NETLWF_RETRIES 10
 
-static VOID winNetCfgLogger(LPCSTR szString)
+static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", szString);
+    printf("%s", pszString);
 }