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

Timestamp:

Sep 17, 2010 11:34:06 AM (14 years ago)

Author:

vboxsync

Message:

Logging.

File:

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

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

@@ -65 +65 @@
 int VBoxDisplayInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
+    Log(("VBoxTray: VBoxDisplayInit ...\n"));
+
     OSVERSIONINFO OSinfo;
     OSinfo.dwOSVersionInfoSize = sizeof (OSinfo);
@@ -75 +77 @@
     if (NULL == hUser)
     {
-        Log(("VBoxTray: Could not get module handle of USER32.DLL!\n"));
+        Log(("VBoxTray: VBoxDisplayInit: Could not get module handle of USER32.DLL!\n"));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -81 +83 @@
     {
         *(uintptr_t *)&gCtx.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
-        Log(("VBoxTray: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
+        Log(("VBoxTray: VBoxDisplayInit: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
 
         *(uintptr_t *)&gCtx.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA");
-        Log(("VBoxTray: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
+        Log(("VBoxTray: VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
 
 #ifdef VBOXWDDM
@@ -90 +92 @@
         {
             /* this is vista and up, check if we need to switch the display driver if to WDDM mode */
-            Log(("VBoxTray: this is vista and up\n"));
+            Log(("VBoxTray: VBoxDisplayInit: this is Windows Vista and up\n"));
             VBOXDISPLAY_DRIVER_TYPE enmType = getVBoxDisplayDriverType (&gCtx);
             if (enmType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
             {
-                Log(("VBoxTray: WDDM driver is installed, switching display driver if to WDDM mode\n"));
+                Log(("VBoxTray: VBoxDisplayInit: WDDM driver is installed, switching display driver if to WDDM mode\n"));
                 /* this is hacky, but the most easiest way */
                 DWORD err = VBoxDispIfSwitchMode(const_cast<PVBOXDISPIF>(&pEnv->dispIf), VBOXDISPIF_MODE_WDDM, NULL /* old mode, we don't care about it */);
                 if (err == NO_ERROR)
-                    Log(("VBoxTray: DispIf switched to WDDM mode successfully\n"));
+                    Log(("VBoxTray: VBoxDisplayInit: DispIf switched to WDDM mode successfully\n"));
                 else
-                    Log(("VBoxTray: failed to switch DispIf to WDDM mode, err (%d)\n", err));
+                    Log(("VBoxTray: VBoxDisplayInit: Failed to switch DispIf to WDDM mode, err (%d)\n", err));
             }
         }
@@ -111 +113 @@
     else                                /* Unsupported platform */
     {
-        Log(("VBoxTray: Warning, display for platform not handled yet!\n"));
+        Log(("VBoxTray: VBoxDisplayInit: Warning, display for platform not handled yet!\n"));
         return VERR_NOT_IMPLEMENTED;
     }
 
-    Log(("VBoxTray: Display init successful.\n"));
+    Log(("VBoxTray: VBoxDisplayInit: Display init successful\n"));
 
     *pfStartThread = true;
@@ -128 +130 @@
 
 #ifdef VBOXWDDM
-static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType (VBOXDISPLAYCONTEXT *pCtx)
+static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType(VBOXDISPLAYCONTEXT *pCtx)
 #else
-static bool isVBoxDisplayDriverActive (VBOXDISPLAYCONTEXT *pCtx)
+static bool isVBoxDisplayDriverActive(VBOXDISPLAYCONTEXT *pCtx)
 #endif
 {
@@ -146 +148 @@
         dispDevice.cb = sizeof(DISPLAY_DEVICE);
 
-        Log(("VBoxTray: Checking for active VBox display driver (W2K+)...\n"));
+        Log(("VBoxTray: isVBoxDisplayDriverActive: Checking for active VBox display driver (W2K+) ...\n"));
 
         while (EnumDisplayDevices(NULL,
@@ -153 +155 @@
                                   0))
         {
-            Log(("VBoxTray: DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+            Log(("VBoxTray: isVBoxDisplayDriverActive: DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
                           devNum,
                           &dispDevice.DeviceName[0],
@@ -163 +165 @@
             if (dispDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
             {
-                Log(("VBoxTray: Primary device.\n"));
+                Log(("VBoxTray: isVBoxDisplayDriverActive: Primary device\n"));
 
                 if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
@@ -185 +187 @@
     else    /* This must be NT 4 or something really old, so don't use EnumDisplayDevices() here  ... */
     {
-        Log(("VBoxTray: Checking for active VBox display driver (NT or older)...\n"));
+        Log(("VBoxTray: isVBoxDisplayDriverActive: Checking for active VBox display driver (NT or older) ...\n"));
 
         DEVMODE tempDevMode;
@@ -209 +211 @@
 
 /* Returns TRUE to try again. */
-static BOOL ResizeDisplayDevice(
-        ULONG Id, DWORD Width, DWORD Height, DWORD BitsPerPixel
-        )
+static BOOL ResizeDisplayDevice(ULONG Id, DWORD Width, DWORD Height, DWORD BitsPerPixel)
 {
     BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0);
@@ -225 +225 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     {
-        Log(("VBoxTray: [%d] %s\n", i, DisplayDevice.DeviceName));
+        Log(("VBoxTray: ResizeDisplayDevice: [%d] %s\n", i, DisplayDevice.DeviceName));
 
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
@@ -302 +302 @@
                  ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings err %d\n", GetLastError ()));
+                Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings error %d\n", GetLastError ()));
                 return FALSE;
             }
@@ -321 +321 @@
                      * Do not return here, ignore the error and set the display info to 0x0x0.
                      */
-                    Log(("VBoxTray: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) err %d\n", GetLastError ()));
+                    Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) error %d\n", GetLastError ()));
                     ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
                 }
@@ -443 +443 @@
  * requests
  */
-unsigned __stdcall VBoxDisplayThread  (void *pInstance)
+unsigned __stdcall VBoxDisplayThread(void *pInstance)
 {
+    Log(("VBoxTray: VBoxDisplayThread: Entered\n"));
+
     VBOXDISPLAYCONTEXT *pCtx = (VBOXDISPLAYCONTEXT *)pInstance;
     HANDLE gVBoxDriver = pCtx->pEnv->hDriver;
@@ -453 +455 @@
     maskInfo.u32OrMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
     maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
+    if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
         Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - or) succeeded\n"));
@@ -465 +467 @@
     do
     {
-        /* wait for a display change event */
+        /* Wait for a display change event. */
         VBoxGuestWaitEventInfo waitEvent;
         waitEvent.u32TimeoutIn = 1000;