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

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/Main/src-server

Files:

• HostVideoInputDeviceImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)
• win/svcmain.cpp (modified) (3 diffs)

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