Changeset 95118 in vbox for trunk/src/VBox/Main

Timestamp:

May 25, 2022 8:57:49 PM (3 years ago)

Author:

vboxsync

Message:

Main/VirtualBoxImpl: Don't use DECLCALLBACKPTR for a C++ callback which certainly may throw std::bad_alloc if not worse (noexcept/c++17).

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -148 +148 @@
 
 #ifdef RT_OS_WINDOWS
-    typedef DECLCALLBACKPTR(HRESULT, SVCHelperClientFunc,(SVCHlpClient *aClient, Progress *aProgress, void *aUser, int *aVrc));
+    typedef HRESULT (*PFN_SVC_HELPER_CLIENT_T)(SVCHlpClient *aClient, Progress *aProgress, void *aUser, int *aVrc);
     HRESULT i_startSVCHelperClient(bool aPrivileged,
-                                   SVCHelperClientFunc aFunc,
+                                   PFN_SVC_HELPER_CLIENT_T aFunc,
                                    void *aUser, Progress *aProgress);
 #endif

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3086 +3086 @@
               Progress* aProgress,
               bool aPrivileged,
-              VirtualBox::SVCHelperClientFunc aFunc,
+              VirtualBox::PFN_SVC_HELPER_CLIENT_T aFunc,
               void *aUser)
     {
@@ -3109 +3109 @@
     ComObjPtr<Progress> progress;
     bool privileged;
-    VirtualBox::SVCHelperClientFunc func;
+    VirtualBox::PFN_SVC_HELPER_CLIENT_T func;
     void *user;
     ThreadVoidData *threadVoidData;
@@ -3171 +3171 @@
  */
 HRESULT VirtualBox::i_startSVCHelperClient(bool aPrivileged,
-                                           SVCHelperClientFunc aFunc,
+                                           PFN_SVC_HELPER_CLIENT_T aFunc,
                                            void *aUser, Progress *aProgress)
 {