Changeset 85121 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

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/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (2 diffs)
• seamless-x11.h (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -430 +430 @@
 RTVEC_DECL(RectList, RTRECT)
 
-DECLCALLBACK(int) getRectsCallback(VBoxGuestWinInfo *pInfo,
-                                   struct RectList *pRects)
+static DECLCALLBACK(int) getRectsCallback(VBoxGuestWinInfo *pInfo, struct RectList *pRects)
 {
     if (pInfo->mhasShape)
@@ -485 +484 @@
             return rc;
     }
-    mGuestWindows.doWithAll((PVBOXGUESTWINCALLBACK)getRectsCallback,
-                            &rects);
+    mGuestWindows.doWithAll((PFNVBOXGUESTWINCALLBACK)getRectsCallback, &rects);
     if (mpRects)
         RTMemFree(mpRects);

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

@@ -49 +49 @@
 /** Structure containing information about a guest window's position and visible area.
     Used inside of VBoxGuestWindowList. */
-struct VBoxGuestWinInfo {
+struct VBoxGuestWinInfo
+{
 public:
     /** Header structure for insertion into an AVL tree */
@@ -66 +67 @@
     XRectangle *mpRects;
     /** Constructor. */
-    VBoxGuestWinInfo(bool hasShape, int x, int y, int w, int h, int cRects,
-                     XRectangle *pRects)
-            : mhasShape(hasShape), mX(x), mY(y), mWidth(w), mHeight(h),
-              mcRects(cRects), mpRects(pRects) {}
+    VBoxGuestWinInfo(bool hasShape, int x, int y, int w, int h, int cRects, XRectangle *pRects)
+        : mhasShape(hasShape), mX(x), mY(y), mWidth(w), mHeight(h)
+        , mcRects(cRects), mpRects(pRects)
+    {}
 
     /** Destructor */
@@ -83 +84 @@
 private:
     // We don't want a copy constructor or assignment operator
-    VBoxGuestWinInfo(const VBoxGuestWinInfo&);
-    VBoxGuestWinInfo& operator=(const VBoxGuestWinInfo&);
+    VBoxGuestWinInfo(const VBoxGuestWinInfo &);
+    VBoxGuestWinInfo &operator=(const VBoxGuestWinInfo &);
 };
 
 /** Callback type used for "DoWithAll" calls */
-typedef DECLCALLBACK(int) VBOXGUESTWINCALLBACK(VBoxGuestWinInfo *, void *);
+typedef DECLCALLBACKTYPE(int, FNVBOXGUESTWINCALLBACK,(VBoxGuestWinInfo *, void *));
 /** Pointer to VBOXGUESTWINCALLBACK */
-typedef VBOXGUESTWINCALLBACK *PVBOXGUESTWINCALLBACK;
-
-DECLCALLBACK(int) inline VBoxGuestWinCleanup(VBoxGuestWinInfo *pInfo, void *)
+typedef FNVBOXGUESTWINCALLBACK *PFNVBOXGUESTWINCALLBACK;
+
+static inline DECLCALLBACK(int) VBoxGuestWinCleanup(VBoxGuestWinInfo *pInfo, void *)
 {
     delete pInfo;
@@ -136 +137 @@
     }
 
-    void detachAll(PVBOXGUESTWINCALLBACK pCallback, void *pvParam)
-    {
-        RTAvlU32Destroy(&mWindows, (PAVLU32CALLBACK)pCallback, pvParam);
-    }
-
-    int doWithAll(PVBOXGUESTWINCALLBACK pCallback, void *pvParam)
-    {
-        return RTAvlU32DoWithAll(&mWindows, 1, (PAVLU32CALLBACK)pCallback,
-                                 pvParam);
+    void detachAll(PFNVBOXGUESTWINCALLBACK pfnCallback, void *pvParam)
+    {
+        RTAvlU32Destroy(&mWindows, (PAVLU32CALLBACK)pfnCallback, pvParam);
+    }
+
+    int doWithAll(PFNVBOXGUESTWINCALLBACK pfnCallback, void *pvParam)
+    {
+        return RTAvlU32DoWithAll(&mWindows, 1, (PAVLU32CALLBACK)pfnCallback, pvParam);
     }
 
@@ -152 +152 @@
         LogRelFlowFunc(("hWin=%lu, isMapped=%RTbool, x=%d, y=%d, w=%d, h=%d, cRects=%d\n",
                         (unsigned long) hWin, isMapped, x, y, w, h, cRects));
-        VBoxGuestWinInfo *pInfo = new VBoxGuestWinInfo(isMapped, x, y, w, h, cRects,
-                                                       pRects);
+        VBoxGuestWinInfo *pInfo = new VBoxGuestWinInfo(isMapped, x, y, w, h, cRects, pRects);
         pInfo->Core.Key = hWin;
         LogRelFlowFuncLeave();