Changeset 68630 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

Timestamp:

Sep 5, 2017 11:33:54 AM (7 years ago)

Author:

vboxsync

Message:

Adding VBoxGuestCoreTypes.h for avoiding having to include VMMDev.h from VBoxGuestLib.h. Dropped a few unnecessary VMMDev.h includes here and there.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 #include "VBoxSeamless.h"
 
-#include <malloc.h>
-
+#include <iprt/alloca.h>
 #include <iprt/assert.h>
 #ifdef VBOX_WITH_WDDM
@@ -26 +30 @@
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG /** @todo r=bird: these are all default values. sigh. */
 # define LOG_ENABLED
 # define LOG_GROUP LOG_GROUP_DEFAULT
 #endif
 #include <VBox/log.h>
-#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST & VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED */
 
 #include <VBoxDisplay.h>
@@ -37 +41 @@
 
 
-
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 typedef struct _VBOXDISPLAYCONTEXT
 {
@@ -50 +56 @@
 } VBOXDISPLAYCONTEXT, *PVBOXDISPLAYCONTEXT;
 
-static VBOXDISPLAYCONTEXT g_Ctx = { 0 };
-
 typedef enum
 {
@@ -59 +63 @@
 } VBOXDISPLAY_DRIVER_TYPE;
 
-static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType (VBOXDISPLAYCONTEXT *pCtx);
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static VBOXDISPLAYCONTEXT g_Ctx = { 0 };
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType(VBOXDISPLAYCONTEXT *pCtx);
+
 
 static DECLCALLBACK(int) VBoxDisplayInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
@@ -551 +566 @@
     LogFlowFunc(("ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
 
-    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
-    DEVMODE *paDeviceModes = (DEVMODE *)alloca (sizeof (DEVMODE) * NumDevices);
+    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca(sizeof (DISPLAY_DEVICE) * NumDevices);
+    DEVMODE *paDeviceModes = (DEVMODE *)alloca(sizeof (DEVMODE) * NumDevices);
     RECTL *paRects = (RECTL *)alloca (sizeof (RECTL) * NumDevices);
     DWORD DevNum = 0;