Changeset 50485 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Feb 17, 2014 3:56:40 PM (11 years ago)

Author:

vboxsync

Message:

HGSMI memory allocator: x11 build fix.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• vbva.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -124 +124 @@
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
         $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp

trunk/src/VBox/Additions/x11/vboxvideo/vbva.c

@@ -32 +32 @@
 
 #include "vboxvideo.h"
+
+#ifdef XORG_7X
+# include <stdlib.h>
+#endif
 
 /**************************************************************************
@@ -143 +147 @@
 }
 
+static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb)
+{
+    NOREF(pvEnv);
+    return calloc(1, cb);
+}
+
+static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv)
+{
+    NOREF(pvEnv);
+    free(pv);
+}
+
+static HGSMIENV g_hgsmiEnv =
+{
+    NULL,
+    hgsmiEnvAlloc,
+    hgsmiEnvFree
+};
+
 /**
  * Initialise VirtualBox's accelerated video extensions.
@@ -168 +191 @@
     rc = VBoxHGSMISetupGuestContext(&pVBox->guestCtx, pvGuestHeapMemory,
                                     cbGuestHeapMemory,
-                                    offVRAMBaseMapping + offGuestHeapMemory);
+                                    offVRAMBaseMapping + offGuestHeapMemory,
+                                    &g_hgsmiEnv);
     if (RT_FAILURE(rc))
     {