Changeset 51469 in vbox

Timestamp:

May 30, 2014 11:49:42 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94055

Message:

VBoxTray: Logging; ripped out all custom logging.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxClipboard.cpp (modified) (31 diffs)
• VBoxDispIf.cpp (modified) (106 diffs)
• VBoxDisplay.cpp (modified) (58 diffs)
• VBoxDnDDataObject.cpp (modified) (1 diff)
• VBoxDnDDropSource.cpp (modified) (1 diff)
• VBoxDnDDropTarget.cpp (modified) (1 diff)
• VBoxDnDEnumFormat.cpp (modified) (1 diff)
• VBoxHostVersion.cpp (modified) (3 diffs)
• VBoxIPC.cpp (modified) (16 diffs)
• VBoxLA.cpp (modified) (57 diffs)
• VBoxMMR.cpp (modified) (5 diffs)
• VBoxSeamless.cpp (modified) (2 diffs)
• VBoxSharedFolders.cpp (modified) (16 diffs)
• VBoxTray.cpp (modified) (76 diffs)
• VBoxTray.h (modified) (3 diffs)
• VBoxVRDP.cpp (modified) (17 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <strsafe.h>
 
+#include <VBox/VMMDev.h>
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
+
+
 typedef struct _VBOXCLIPBOARDCONTEXT
 {
@@ -67 +76 @@
         while ((format = EnumClipboardFormats (format)) != 0)
         {
-            Log(("VBoxTray: vboxClipboardChanged: format = 0x%08X\n", format));
+            LogFlowFunc(("vboxClipboardChanged: format = 0x%08X\n", format));
             switch (format)
             {
@@ -141 +150 @@
             HWND hwndNext    = (HWND)lParam;
 
-            Log(("VBoxTray: vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
+            LogFlowFunc(("WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
 
             if (hwndRemoved == pCtx->hwndNextInChain)
@@ -164 +173 @@
         case WM_DRAWCLIPBOARD:
         {
-            Log(("VBoxTray: vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
+            LogFlowFunc(("WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
             if (GetClipboardOwner () != hwnd)
@@ -172 +181 @@
                 int vboxrc = vboxClipboardChanged(pCtx);
                 if (RT_FAILURE(vboxrc))
-                    Log(("VBoxTray: vboxClipboardProcessMsg: vboxClipboardChanged failed, rc = %Rrc\n", vboxrc));
+                    LogFlowFunc(("vboxClipboardChanged failed, rc = %Rrc\n", vboxrc));
             }
 
@@ -209 +218 @@
             UINT format = (UINT)wParam;
 
-            Log(("VBoxTray: vboxClipboardProcessMsg: WM_RENDERFORMAT, format = %x\n", format));
+            LogFlowFunc(("WM_RENDERFORMAT, format = %x\n", format));
             switch (format)
             {
@@ -240 +249 @@
             {
                 /* Unsupported clipboard format is requested. */
-                Log(("VBoxTray: vboxClipboardProcessMsg: Unsupported clipboard format requested: %ld\n", u32Format));
+                LogFlowFunc(("Unsupported clipboard format requested: %ld\n", u32Format));
                 EmptyClipboard();
             }
@@ -250 +259 @@
                 /* Preallocate a buffer, most of small text transfers will fit into it. */
                 HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, cbPrealloc);
-                Log(("VBoxTray: vboxClipboardProcessMsg: Preallocated handle hMem = %p\n", hMem));
+                LogFlowFunc(("Preallocated handle hMem = %p\n", hMem));
 
                 if (hMem)
                 {
                     void *pMem = GlobalLock(hMem);
-                    Log(("VBoxTray: vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
+                    LogFlowFunc(("Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
 
                     if (pMem)
@@ -261 +270 @@
                         /* Read the host data to the preallocated buffer. */
                         int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cbPrealloc, &cb);
-                        Log(("VBoxTray: vboxClipboardProcessMsg: VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
+                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
 
                         if (RT_SUCCESS(vboxrc))
@@ -280 +289 @@
                                 /* The preallocated buffer is too small, adjust the size. */
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                Log(("VBoxTray: vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
+                                LogFlowFunc(("Reallocated hMem = %p\n", hMem));
 
                                 if (hMem)
                                 {
                                     pMem = GlobalLock(hMem);
-                                    Log(("VBoxTray: vboxClipboardProcessMsg: Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
+                                    LogFlowFunc(("Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
 
                                     if (pMem)
@@ -292 +301 @@
                                         uint32_t cbNew = 0;
                                         vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cb, &cbNew);
-                                        Log(("VBoxTray: VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
+                                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
 
                                         if (RT_SUCCESS (vboxrc) && cbNew <= cb)
@@ -345 +354 @@
 
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                Log(("VBoxTray: vboxClipboardProcessMsg: Reallocated hMem = %p\n", hMem));
+                                LogFlowFunc(("Reallocated hMem = %p\n", hMem));
 
                                 if (hMem)
@@ -352 +361 @@
                                      * size is 'cb' and format is 'format'. */
                                     HANDLE hClip = SetClipboardData(format, hMem);
-                                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_RENDERFORMAT hClip = %p\n", hClip));
+                                    LogFlowFunc(("WM_RENDERFORMAT hClip = %p\n", hClip));
 
                                     if (hClip)
@@ -395 +404 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
+                LogFlowFunc(("WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
             }
             else
@@ -405 +414 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                 {
-                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
+                    LogFlowFunc(("WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
                     hClip = SetClipboardData(CF_UNICODETEXT, NULL);
                 }
@@ -411 +420 @@
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                 {
-                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
+                    LogFlowFunc(("WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
                     hClip = SetClipboardData(CF_DIB, NULL);
                 }
@@ -418 +427 @@
                 {
                     UINT format = RegisterClipboardFormat ("HTML Format");
-                    Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
+                    LogFlowFunc(("WM_USER: VBOX_SHARED_CLIPBOARD_FMT_HTML 0x%04X\n", format));
                     if (format != 0)
                     {
@@ -426 +435 @@
 
                 CloseClipboard();
-                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: hClip = %p, err = %ld\n", hClip, GetLastError ()));
+                LogFlowFunc(("WM_USER: hClip = %p, err = %ld\n", hClip, GetLastError ()));
             }
         } break;
@@ -438 +447 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
+                LogFlowFunc(("WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
             }
             else
@@ -452 +461 @@
                         if (lp != NULL)
                         {
-                            Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_DIB\n"));
+                            LogFlowFunc(("WM_USER + 1: CF_DIB\n"));
                             vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
                                                               lp, GlobalSize(hClip));
@@ -473 +482 @@
                         if (uniString != NULL)
                         {
-                            Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_UNICODETEXT\n"));
+                            LogFlowFunc(("WM_USER + 1: CF_UNICODETEXT\n"));
                             vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
                                                               uniString, (lstrlenW(uniString) + 1) * 2);
@@ -496 +505 @@
                             if (lp != NULL)
                             {
-                                Log(("VBoxTray: vboxClipboardProcessMsg: WM_USER + 1: CF_HTML\n"));
+                                LogFlowFunc(("WM_USER + 1: CF_HTML\n"));
                                 vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
                                                                   lp, GlobalSize(hClip));
@@ -526 +535 @@
 
 #ifndef DEBUG_andy
-    Log(("VBoxTray: vboxClipboardProcessMsg returned with rc = %ld\n", rc));
+    LogFlowFunc(("vboxClipboardProcessMsg returned with rc = %ld\n", rc));
 #endif
     return rc;
@@ -578 +587 @@
     }
 
-    Log(("VBoxTray: vboxClipboardInit returned with rc = %Rrc\n", rc));
+    LogFlowFunc(("vboxClipboardInit returned with rc = %Rrc\n", rc));
     return rc;
 }
@@ -612 +621 @@
 int VBoxClipboardInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxTray: VBoxClipboardInit\n"));
+    LogFlowFunc(("VBoxClipboardInit\n"));
     if (gCtx.pEnv)
     {
@@ -651 +660 @@
 unsigned __stdcall VBoxClipboardThread(void *pInstance)
 {
-    Log(("VBoxTray: VBoxClipboardThread\n"));
+    LogFlowFunc(("VBoxClipboardThread\n"));
 
     VBOXCLIPBOARDCONTEXT *pCtx = (VBOXCLIPBOARDCONTEXT *)pInstance;
@@ -664 +673 @@
         if (RT_FAILURE(rc))
         {
-            Log(("VBoxTray: VBoxClipboardThread: Failed to call the driver for host message! rc = %Rrc\n", rc));
+            LogFlowFunc(("VBoxClipboardThread: Failed to call the driver for host message! rc = %Rrc\n", rc));
             if (rc == VERR_INTERRUPTED)
             {
@@ -681 +690 @@
         else
         {
-            Log(("VBoxTray: VBoxClipboardThread: VbglR3ClipboardGetHostMsg u32Msg = %ld, u32Formats = %ld\n", u32Msg, u32Formats));
+            LogFlowFunc(("VBoxClipboardThread: VbglR3ClipboardGetHostMsg u32Msg = %ld, u32Formats = %ld\n", u32Msg, u32Formats));
             switch (u32Msg)
             {
@@ -706 +715 @@
                 default:
                 {
-                    Log(("VBoxTray: VBoxClipboardThread: Unsupported message from host! Message = %ld\n", u32Msg));
+                    LogFlowFunc(("VBoxClipboardThread: Unsupported message from host! Message = %ld\n", u32Msg));
                 }
             }
@@ -719 +728 @@
     if (pCtx != &gCtx)
     {
-        Log(("VBoxTray: VBoxClipboardDestroy: invalid instance %p (our = %p)!\n", pCtx, &gCtx));
+        LogFlowFunc(("VBoxClipboardDestroy: invalid instance %p (our = %p)!\n", pCtx, &gCtx));
         pCtx = &gCtx;
     }

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

@@ -1 +1 @@
 /** @file
- * VBoxTray - Display Settings Interface abstraction for XPDM & WDDM
+ * VBoxDispIf.cpp - Display Settings Interface abstraction for XPDM & WDDM.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -14 +14 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
 #include "VBoxTray.h"
+#include "VBoxDisplay.h"
+
+#include <malloc.h>
 #define _WIN32_WINNT 0x0601
+
 #include <iprt/log.h>
 #include <iprt/err.h>
 #include <iprt/assert.h>
 
-#include <malloc.h>
-
 #ifdef VBOX_WITH_WDDM
 #include <iprt/asm.h>
 #endif
 
-#include "VBoxDisplay.h"
+
 
 #ifndef NT_SUCCESS
@@ -84 +85 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed GetDisplayConfigBufferSizes\n"));
+        LogFlowFunc(("Failed calling GetDisplayConfigBufferSizes, dwErr=%ld\n", winEr));
         return winEr;
     }
 
+    /** @todo r=andy Why using malloc() instead of RTMemAlloc*? */
     pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(cPathInfoArray * sizeof(DISPLAYCONFIG_PATH_INFO));
     if (!pPathInfoArray)
     {
-        WARN(("VBoxTray: (WDDM) malloc failed!\n"));
+        LogFlowFunc(("Allocating pPathInfoArray failed\n"));
         return ERROR_OUTOFMEMORY;
     }
@@ -97 +99 @@
     if (!pModeInfoArray)
     {
-        WARN(("VBoxTray: (WDDM) malloc failed!\n"));
+        LogFlowFunc(("Allocating pModeInfoArray failed\n"));
         free(pPathInfoArray);
         return ERROR_OUTOFMEMORY;
@@ -105 +107 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed QueryDisplayConfig\n"));
+        LogFlowFunc(("Failed calling QueryDisplayConfig, dwErr=%ld\n", winEr));
         free(pPathInfoArray);
         free(pModeInfoArray);
@@ -122 +124 @@
     memset(pCfgDst, 0, sizeof (*pCfgDst));
 
+    /** @todo r=andy Why using malloc() instead of RTMemAlloc*? */
     if (pCfg->cPathInfoArray)
     {
@@ -127 +130 @@
         if (!pCfgDst->pPathInfoArray)
         {
-            WARN(("VBoxTray: (WDDM) malloc failed!\n"));
+            LogFlowFunc(("malloc failed!\n"));
             return ERROR_OUTOFMEMORY;
         }
@@ -141 +144 @@
         if (!pCfgDst->pModeInfoArray)
         {
-            WARN(("VBoxTray: (WDDM) malloc failed!\n"));
+            LogFlowFunc(("malloc failed!\n"));
             if (pCfgDst->pPathInfoArray)
             {
@@ -179 +182 @@
         if (winEr != ERROR_SUCCESS)
         {
-            WARN(("VBoxTray:(WDDM) vboxDispIfWddmDcCreate Failed winEr %d\n", winEr));
+            LogFlowFunc(("vboxDispIfWddmDcCreate failed winEr %ld\n", winEr));
             return winEr;
         }
@@ -255 +258 @@
     if (!pModeInfoArray)
     {
-        WARN(("VBoxTray: (WDDM) malloc failed!\n"));
+        LogFlowFunc(("malloc failed!\n"));
         return ERROR_OUTOFMEMORY;
     }
@@ -280 +283 @@
         {
 
-            WARN(("VBoxTray: (WDDM) no source mode index specified"));
+            LogFlowFunc(("no source mode index specified"));
             DWORD winEr = vboxDispIfWddmDcSettingsModeAdd(pCfg, &iSrcMode);
             if (winEr != ERROR_SUCCESS)
             {
-                WARN(("VBoxTray:(WDDM) vboxDispIfWddmDcSettingsModeAdd Failed winEr %d\n", winEr));
+                LogFlowFunc(("vboxDispIfWddmDcSettingsModeAdd Failed winEr %d\n", winEr));
                 return winEr;
             }
@@ -298 +301 @@
             {
                 /* this is something we're not expecting/supporting */
-                WARN(("VBoxTray: (WDDM) multiple paths have the same mode index"));
+                LogFlowFunc(("multiple paths have the same mode index"));
                 return ERROR_NOT_SUPPORTED;
             }
@@ -329 +332 @@
                     break;
                 default:
-                    LogRel(("VBoxTray: (WDDM) invalid bpp %d, using 32\n", pDeviceMode->dmBitsPerPel));
+                    LogRel(("invalid bpp %d, using 32\n", pDeviceMode->dmBitsPerPel));
                     pCfg->pModeInfoArray[iSrcMode].sourceMode.pixelFormat = DISPLAYCONFIG_PIXELFORMAT_32BPP;
                     break;
@@ -350 +353 @@
     DWORD winEr = gCtx.pfnSetDisplayConfig(pCfg->cPathInfoArray, pCfg->pPathInfoArray, pCfg->cModeInfoArray, pCfg->pModeInfoArray, fFlags);
     if (winEr != ERROR_SUCCESS)
-        Log(("VBoxTray:(WDDM) pfnSetDisplayConfig Failed for Flags 0x%x\n", fFlags));
+        LogFlowFunc(("pfnSetDisplayConfig Failed for Flags 0x%x\n", fFlags));
     return winEr;
 }
@@ -394 +397 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray:(WDDM) vboxDispIfWddmDcQueryNumDisplays Failed winEr %d\n", winEr));
+        LogFlowFunc(("vboxDispIfWddmDcQueryNumDisplays Failed winEr %d\n", winEr));
         return winEr;
     }
@@ -401 +404 @@
     if (!pPathInfoArray)
     {
-        WARN(("malloc failed\n"));
+        LogFlowFunc(("malloc failed\n"));
         return ERROR_OUTOFMEMORY;
     }
@@ -413 +416 @@
             if (idx >= 0)
             {
-                WARN(("VBoxTray:(WDDM) different source and target paare enabled, this is something we would not expect\n"));
+                LogFlowFunc(("different source and target paare enabled, this is something we would not expect\n"));
             }
         }
@@ -426 +429 @@
                 if (winEr != ERROR_SUCCESS)
                 {
-                    WARN(("VBoxTray:(WDDM) vboxDispIfWddmDcCreate Failed winEr %d\n", winEr));
+                    LogFlowFunc(("vboxDispIfWddmDcCreate Failed winEr %d\n", winEr));
                     free(pPathInfoArray);
                     return winEr;
@@ -436 +439 @@
             if (idx < 0)
             {
-                WARN(("VBoxTray:(WDDM) %d %d path not supported\n", i, i));
+                LogFlowFunc(("%d %d path not supported\n", i, i));
                 idx = vboxDispIfWddmDcSearchPath(pCfg, -1, i);
                 if (idx < 0)
                 {
-                    WARN(("VBoxTray:(WDDM) %d %d path not supported\n", -1, i));
+                    LogFlowFunc(("%d %d path not supported\n", -1, i));
                 }
             }
@@ -450 +453 @@
                 if (pPathInfoArray[i].flags & DISPLAYCONFIG_PATH_ACTIVE)
                 {
-                    WARN(("VBoxTray:(WDDM) disabled path %d %d is marked active\n",
+                    LogFlowFunc(("disabled path %d %d is marked active\n",
                             pPathInfoArray[i].sourceInfo.id, pPathInfoArray[i].targetInfo.id));
                     pPathInfoArray[i].flags &= ~DISPLAYCONFIG_PATH_ACTIVE;
@@ -518 +521 @@
                 return ERROR_SUCCESS;
             else
-                WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
+                LogFlowFunc(("vboxDispKmtCreateContext failed hr 0x%x", hr));
 
             vboxDispKmtDestroyDevice(&pOp->Device);
         }
         else
-            WARN(("VBoxTray: vboxDispKmtCreateDevice failed hr 0x%x", hr));
+            LogFlowFunc(("vboxDispKmtCreateDevice failed hr 0x%x", hr));
 
         vboxDispKmtCloseAdapter(&pOp->Adapter);
@@ -597 +600 @@
     if (OSinfo.dwMajorVersion >= 6)
     {
-        Log((__FUNCTION__": this is vista and up\n"));
+        LogFlowFunc(("this is vista and up\n"));
         HMODULE hUser = GetModuleHandle("user32.dll");
         if (hUser)
         {
             *(uintptr_t *)&pIf->modeData.wddm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
-            Log((__FUNCTION__": VBoxDisplayInit: pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.wddm.pfnChangeDisplaySettingsEx));
+            LogFlowFunc(("pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.wddm.pfnChangeDisplaySettingsEx));
             bSupported &= !!(pIf->modeData.wddm.pfnChangeDisplaySettingsEx);
 
             *(uintptr_t *)&pIf->modeData.wddm.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA");
-            Log((__FUNCTION__": VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", pIf->modeData.wddm.pfnEnumDisplayDevices));
+            LogFlowFunc(("pfnEnumDisplayDevices = %p\n", pIf->modeData.wddm.pfnEnumDisplayDevices));
             bSupported &= !!(pIf->modeData.wddm.pfnEnumDisplayDevices);
             /* for win 7 and above */
@@ -612 +615 @@
             {
                 *(uintptr_t *)&gCtx.pfnSetDisplayConfig = (uintptr_t)GetProcAddress(hUser, "SetDisplayConfig");
-                Log((__FUNCTION__": VBoxDisplayInit: pfnSetDisplayConfig = %p\n", gCtx.pfnSetDisplayConfig));
+                LogFlowFunc(("pfnSetDisplayConfig = %p\n", gCtx.pfnSetDisplayConfig));
                 bSupported &= !!(gCtx.pfnSetDisplayConfig);
 
                 *(uintptr_t *)&gCtx.pfnQueryDisplayConfig = (uintptr_t)GetProcAddress(hUser, "QueryDisplayConfig");
-                Log((__FUNCTION__": VBoxDisplayInit: pfnQueryDisplayConfig = %p\n", gCtx.pfnQueryDisplayConfig));
+                LogFlowFunc(("pfnQueryDisplayConfig = %p\n", gCtx.pfnQueryDisplayConfig));
                 bSupported &= !!(gCtx.pfnQueryDisplayConfig);
 
                 *(uintptr_t *)&gCtx.pfnGetDisplayConfigBufferSizes = (uintptr_t)GetProcAddress(hUser, "GetDisplayConfigBufferSizes");
-                Log((__FUNCTION__": VBoxDisplayInit: pfnGetDisplayConfigBufferSizes = %p\n", gCtx.pfnGetDisplayConfigBufferSizes));
+                LogFlowFunc(("pfnGetDisplayConfigBufferSizes = %p\n", gCtx.pfnGetDisplayConfigBufferSizes));
                 bSupported &= !!(gCtx.pfnGetDisplayConfigBufferSizes);
             }
@@ -628 +631 @@
             if (FAILED(hr))
             {
-                WARN(("VBoxTray: vboxDispKmtCallbacksInit failed hr 0x%x\n", hr));
+                LogFlowFunc(("vboxDispKmtCallbacksInit failed hr 0x%x\n", hr));
                 err = hr;
             }
@@ -634 +637 @@
         else
         {
-            WARN((__FUNCTION__": GetModuleHandle(USER32) failed, err(%d)\n", GetLastError()));
+            LogFlowFunc(("GetModuleHandle(USER32) failed, err(%d)\n", GetLastError()));
             err = ERROR_NOT_SUPPORTED;
         }
@@ -640 +643 @@
     else
     {
-        WARN((__FUNCTION__": can not switch to VBOXDISPIF_MODE_WDDM, because os is not Vista or upper\n"));
+        LogFlowFunc(("Could not switch to VBOXDISPIF_MODE_WDDM, because os is not Vista or upper\n"));
         err = ERROR_NOT_SUPPORTED;
     }
@@ -679 +682 @@
                 {
                     winEr = GetLastError();
-                    WARN(("CreateDC failed %d", winEr));
+                    LogFlowFunc(("CreateDC failed %d", winEr));
                     break;
                 }
             }
-            Log(("display data no match display(%d): i(%d), flags(%d)", iDisplay, i, pDev->StateFlags));
+            LogFlowFunc(("display data no match display(%d): i(%d), flags(%d)", iDisplay, i, pDev->StateFlags));
         }
         else
         {
             winEr = GetLastError();
-            WARN(("EnumDisplayDevices failed %d", winEr));
+            LogFlowFunc(("EnumDisplayDevices failed %d", winEr));
             break;
         }
     }
 
-    WARN(("vboxDispIfWDDMAdpHdcCreate failure branch %d", winEr));
+    LogFlowFunc(("vboxDispIfWDDMAdpHdcCreate failure branch %d", winEr));
     return winEr;
 }
@@ -704 +707 @@
     if (!SUCCEEDED(hr))
     {
-        WARN(("VBoxTray: vboxDispKmtOpenAdapter failed hr 0x%x\n", hr));
+        LogFlowFunc(("vboxDispKmtOpenAdapter failed hr 0x%x\n", hr));
         return hr;
     }
@@ -723 +726 @@
     else
     {
-        WARN(("VBoxTray: pfnD3DKMTEscape failed Status 0x%x\n", Status));
+        LogFlowFunc(("pfnD3DKMTEscape failed Status 0x%x\n", Status));
         winEr = ERROR_GEN_FAILURE;
     }
@@ -746 +749 @@
 #endif
         default:
-            Log((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            LogFlowFunc(("unknown mode (%d)\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -764 +767 @@
 #endif
         default:
-            Log((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            LogFlowFunc(("unknown mode (%d)\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -848 +851 @@
     pMon->fExtDispSup = fExtDispSup;
 
+    /** @todo r=andy Why using malloc() instead of RTMemAlloc*? */
     if (cDevModes)
     {
@@ -854 +858 @@
         if (!pMon->paDisplayDevices)
         {
-            Log(("malloc failed!"));
+            LogFlowFunc(("malloc failed"));
             vboxRrRetryStopLocked();
             LeaveCriticalSection(&pMon->CritSect);
@@ -865 +869 @@
         if (!pMon->paDeviceModes)
         {
-            Log(("malloc failed!"));
+            LogFlowFunc(("malloc failed"));
             vboxRrRetryStopLocked();
             LeaveCriticalSection(&pMon->CritSect);
@@ -878 +882 @@
     if (!pMon->idTimer)
     {
-        WARN(("VBoxTray: SetTimer failed!, err %d\n", GetLastError()));
+        LogFlowFunc(("SetTimer failed, err %ld\n", GetLastError()));
         vboxRrRetryStopLocked();
     }
@@ -910 +914 @@
         case WM_DISPLAYCHANGE:
         {
-            Log(("VBoxTray: WM_DISPLAYCHANGE\n"));
+            LogFlowFunc(("WM_DISPLAYCHANGE\n"));
             VBoxRrRetryStop();
             return 0;
@@ -918 +922 @@
             if (wParam == VBOXRR_TIMER_ID)
             {
-                Log(("VBoxTray: VBOXRR_TIMER_ID\n"));
+                LogFlowFunc(("VBOXRR_TIMER_ID\n"));
                 vboxRrRetryPerform();
                 return 0;
@@ -925 +929 @@
         }
         case WM_CLOSE:
-            Log((__FUNCTION__": got WM_CLOSE for hwnd(0x%x)", hwnd));
+            LogFlowFunc(("got WM_CLOSE for hwnd(0x%x)", hwnd));
             return 0;
         case WM_DESTROY:
-            Log((__FUNCTION__": got WM_DESTROY for hwnd(0x%x)", hwnd));
+            LogFlowFunc(("got WM_DESTROY for hwnd(0x%x)", hwnd));
             return 0;
         case WM_NCHITTEST:
-            Log((__FUNCTION__": got WM_NCHITTEST for hwnd(0x%x)\n", hwnd));
+            LogFlowFunc(("got WM_NCHITTEST for hwnd(0x%x)\n", hwnd));
             return HTNOWHERE;
         default:
@@ -963 +967 @@
         {
             DWORD winErr = GetLastError();
-            WARN((__FUNCTION__": RegisterClass failed, winErr(%d)\n", winErr));
+            LogFlowFunc(("RegisterClass failed, winErr(%d)\n", winErr));
             hr = E_FAIL;
         }
@@ -987 +991 @@
         {
             DWORD winErr = GetLastError();
-            WARN((__FUNCTION__": CreateWindowEx failed, winErr(%d)\n", winErr));
+            LogFlowFunc(("CreateWindowEx failed, winErr(%d)\n", winErr));
             hr = E_FAIL;
         }
@@ -1002 +1006 @@
 
     DWORD winErr = GetLastError();
-    WARN((__FUNCTION__": DestroyWindow failed, winErr(%d) for hWnd(0x%x)\n", winErr, hWnd));
+    LogFlowFunc(("DestroyWindow failed, winErr(%d) for hWnd(0x%x)\n", winErr, hWnd));
 
     return HRESULT_FROM_WIN32(winErr);
@@ -1051 +1055 @@
         {
             hr = S_FALSE;
-            Log(("VBoxTray: GetMessage returned FALSE\n"));
+            LogFlowFunc(("GetMessage returned FALSE\n"));
             VBoxRrRetryStop();
             break;
@@ -1065 +1069 @@
             if (hr == S_OK || hr == S_FALSE)
                 hr = E_FAIL;
-            WARN(("VBoxTray: GetMessage returned -1, err %d\n", winEr));
+            LogFlowFunc(("GetMessage returned -1, err %d\n", winEr));
             VBoxRrRetryStop();
             break;
@@ -1075 +1079 @@
             case WM_CLOSE:
             {
-                Log(("VBoxTray: closing Rr %d\n", Msg.message));
+                LogFlowFunc(("closing Rr %d\n", Msg.message));
                 VBoxRrRetryStop();
                 PostQuitMessage(0);
@@ -1097 +1101 @@
     {
         DWORD winErr = GetLastError();
-        WARN((__FUNCTION__": SetEvent failed, winErr = (%d)", winErr));
+        LogFlowFunc(("SetEvent failed, winErr = (%d)", winErr));
         HRESULT tmpHr = HRESULT_FROM_WIN32(winErr);
         Assert(tmpHr != S_OK);
@@ -1143 +1147 @@
             else
             {
-                Log(("WaitForSingleObject failed!"));
+                LogFlowFunc(("WaitForSingleObject failed"));
                 hr = E_FAIL;
             }
@@ -1150 +1154 @@
         {
             DWORD winErr = GetLastError();
-            WARN((__FUNCTION__": CreateThread failed, winErr = (%d)", winErr));
+            LogFlowFunc(("CreateThread failed, winErr = (%d)", winErr));
             hr = HRESULT_FROM_WIN32(winErr);
             Assert(hr != S_OK);
@@ -1159 +1163 @@
     {
         DWORD winErr = GetLastError();
-        WARN((__FUNCTION__": CreateEvent failed, winErr = (%d)", winErr));
+        LogFlowFunc(("CreateEvent failed, winErr = (%d)", winErr));
         hr = HRESULT_FROM_WIN32(winErr);
         Assert(hr != S_OK);
@@ -1212 +1216 @@
         return ERROR_SUCCESS;
     }
-    WARN(("VBoxTray: VBoxRrInit failed hr 0x%x\n", hr));
+    LogFlowFunc(("VBoxRrInit failed hr 0x%x\n", hr));
     return hr;
 }
@@ -1236 +1240 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
+        LogFlowFunc(("Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
         return winEr;
     }
@@ -1261 +1265 @@
         if (Status != 0)
         {
-            Log(("VBoxTray: (WDDM) pfnD3DKMTPollDisplayChildren failed, Status (0x%x)\n", Status));
+            LogFlowFunc(("pfnD3DKMTPollDisplayChildren failed, Status (0x%x)\n", Status));
             continue;
         }
@@ -1276 +1280 @@
             if (winEr != ERROR_SUCCESS)
             {
-                WARN(("VBoxTray: (WDDM) Failed vboxDispIfQueryDisplayConnection winEr %d\n", winEr));
+                LogFlowFunc(("Failed vboxDispIfQueryDisplayConnection winEr %d\n", winEr));
                 return winEr;
             }
@@ -1282 +1286 @@
             if (!fConnected)
             {
-                WARN(("VBoxTray: (WDDM) Display %d not connected, not expected\n", i));
+                LogFlowFunc(("Display %d not connected, not expected\n", i));
                 fFound = TRUE;
                 break;
@@ -1319 +1323 @@
     else
     {
-        WARN(("VBoxTray: pfnD3DKMTEscape VBOXESC_REINITVIDEOMODESBYMASK failed Status 0x%x\n", Status));
+        LogFlowFunc(("pfnD3DKMTEscape VBOXESC_REINITVIDEOMODESBYMASK failed Status 0x%x\n", Status));
         winEr = ERROR_GEN_FAILURE;
     }
@@ -1325 +1329 @@
     winEr =  vboxDispIfWaitDisplayDataInited(pOp, pScreenIdMask);
     if (winEr != NO_ERROR)
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWaitDisplayDataInited winEr %d\n", winEr));
+        LogFlowFunc(("Failed vboxDispIfWaitDisplayDataInited winEr %d\n", winEr));
 
     return winEr;
@@ -1332 +1336 @@
 DWORD vboxDispIfCancelPendingResizeWDDM(PCVBOXDISPIF const pIf)
 {
-    Log(("VBoxTray: cancelling pending resize\n"));
+    LogFlowFunc(("cancelling pending resize\n"));
     VBoxRrRetryStop();
     return NO_ERROR;
@@ -1348 +1352 @@
         tempDevMode.dmSize = sizeof(DEVMODE);
         EnumDisplaySettings((LPSTR)paDisplayDevices[i].DeviceName, 0xffffff, &tempDevMode);
-        Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
+        LogFlowFunc(("ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
     }
 
@@ -1354 +1358 @@
             paDeviceModes[iChangedMode].dmBitsPerPel, paDeviceModes[iChangedMode].dmPosition.x, paDeviceModes[iChangedMode].dmPosition.y, fEnable, fExtDispSup);
     if (winEr != NO_ERROR)
-        WARN(("VBoxTray: (WDDM) Failed EnableAndResizeDispDev winEr %d\n", winEr));
+        LogFlowFunc(("Failed EnableAndResizeDispDev winEr %d\n", winEr));
 
     return winEr;
@@ -1366 +1370 @@
         winEr = vboxDispIfWddmResizeDisplay(pIf, iChangedMode, fEnable, paDisplayDevices, paDeviceModes, cDevModes);
         if (winEr != NO_ERROR)
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmResizeDisplay winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmResizeDisplay winEr %d\n", winEr));
     }
     else
@@ -1372 +1376 @@
         winEr = vboxDispIfWddmResizeDisplayVista(paDeviceModes, paDisplayDevices, cDevModes, iChangedMode, fEnable, fExtDispSup);
         if (winEr != NO_ERROR)
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmResizeDisplayVista winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmResizeDisplayVista winEr %d\n", winEr));
     }
     return winEr;
@@ -1386 +1390 @@
     UINT i = 0;
 
-    Log(("VBoxTray: vboxDispIfResizeModesWDDM\n"));
+    LogFlowFunc(("vboxDispIfResizeModesWDDM\n"));
     VBoxRrRetryStop();
 
@@ -1394 +1398 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfOpBegin failed winEr 0x%x", winEr));
+        LogFlowFunc(("vboxDispIfOpBegin failed winEr 0x%x", winEr));
         return winEr;
     }
@@ -1431 +1435 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
+        LogFlowFunc(("Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
         return winEr;
     }
@@ -1439 +1443 @@
     if (!pChangeIds)
     {
-        WARN(("VBoxTray: (WDDM) Failed to alloc change ids\n"));
+        LogFlowFunc(("Failed to alloc change ids\n"));
         winEr = ERROR_OUTOFMEMORY;
         goto done;
@@ -1471 +1475 @@
     if (cChangeIds == 0)
     {
-        Log(("VBoxTray: (WDDM) vboxDispIfWddmEnableDisplay: settings are up to date\n"));
+        LogFlowFunc(("vboxDispIfWddmEnableDisplay: settings are up to date\n"));
         winEr = ERROR_SUCCESS;
         goto done;
@@ -1480 +1484 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcSettingsIncludeAllTargets winEr %d\n", winEr));
+        LogFlowFunc(("Failed vboxDispIfWddmDcSettingsIncludeAllTargets winEr %d\n", winEr));
         return winEr;
     }
@@ -1494 +1498 @@
         if (iPath < 0)
         {
-            WARN(("VBoxTray: (WDDM) path index not found while it should"));
+            LogFlowFunc(("path index not found while it should"));
             winEr = ERROR_GEN_FAILURE;
             goto done;
@@ -1502 +1506 @@
         if (winEr != ERROR_SUCCESS)
         {
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcSettingsUpdate winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmDcSettingsUpdate winEr %d\n", winEr));
             goto done;
         }
@@ -1515 +1519 @@
     if (iPath < 0)
     {
-        WARN(("VBoxTray: (WDDM) path index not found while it should"));
+        LogFlowFunc(("path index not found while it should"));
         winEr = ERROR_GEN_FAILURE;
         goto done;
@@ -1523 +1527 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcSettingsUpdate winEr %d\n", winEr));
+        LogFlowFunc(("Failed vboxDispIfWddmDcSettingsUpdate winEr %d\n", winEr));
         goto done;
     }
@@ -1534 +1538 @@
         if (!fSetTopology)
         {
-            WARN(("VBoxTray: (WDDM) vboxDispIfWddmDcSet validation failed winEr, trying with changes %d\n", winEr));
+            LogFlowFunc(("vboxDispIfWddmDcSet validation failed winEr, trying with changes %d\n", winEr));
             fSetFlags |= SDC_ALLOW_CHANGES;
         }
         else
         {
-            Log(("VBoxTray: (WDDM) vboxDispIfWddmDcSet topology validation failed winEr %d\n", winEr));
+            LogFlowFunc(("vboxDispIfWddmDcSet topology validation failed winEr %d\n", winEr));
             goto done;
         }
@@ -1549 +1553 @@
     winEr = vboxDispIfWddmDcSet(&DispCfg, fSetFlags | SDC_APPLY);
     if (winEr != ERROR_SUCCESS)
-        WARN(("VBoxTray: (WDDM) vboxDispIfWddmDcSet apply failed winEr %d\n", winEr));
+        LogFlowFunc(("vboxDispIfWddmDcSet apply failed winEr %d\n", winEr));
 
 done:
@@ -1563 +1567 @@
     {
         if (fEnable)
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
         else
-            Log(("VBoxTray: (WDDM) Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
         winEr = vboxDispIfWddmEnableDisplays(pIf, cIds, pIds, fEnable, TRUE, NULL);
         if (winEr != ERROR_SUCCESS)
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmEnableDisplay mode winEr %d\n", winEr));
     }
 
@@ -1583 +1587 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcCreate\n"));
+        LogFlowFunc(("Failed vboxDispIfWddmDcCreate\n"));
         return winEr;
     }
@@ -1602 +1606 @@
         if (winEr != ERROR_SUCCESS)
         {
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmEnableDisplaysTryingTopology winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmEnableDisplaysTryingTopology winEr %d\n", winEr));
             return winEr;
         }
@@ -1609 +1613 @@
         if (winEr != ERROR_SUCCESS)
         {
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmDcCreate winEr %d\n", winEr));
             return winEr;
         }
@@ -1616 +1620 @@
         if (iPath < 0)
         {
-            WARN(("VBoxTray: (WDDM) path (%d) is still disabled, going to retry winEr %d\n", winEr));
+            LogFlowFunc(("path (%d) is still disabled, going to retry winEr %d\n", winEr));
             vboxDispIfWddmDcTerm(&DispCfg);
             return ERROR_RETRY;
@@ -1632 +1636 @@
         if (winEr != ERROR_SUCCESS)
         {
-            WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmEnableDisplaysTryingTopology winEr %d\n", winEr));
+            LogFlowFunc(("Failed vboxDispIfWddmEnableDisplaysTryingTopology winEr %d\n", winEr));
             return winEr;
         }
@@ -1644 +1648 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray: (WDDM) Failed vboxDispIfWddmDcSettingsUpdate\n"));
+        LogFlowFunc(("Failed vboxDispIfWddmDcSettingsUpdate\n"));
         vboxDispIfWddmDcTerm(&DispCfg);
         return winEr;
@@ -1653 +1657 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray:(WDDM) pfnSetDisplayConfig Failed to validate winEr %d.\n", winEr));
+        LogFlowFunc(("pfnSetDisplayConfig Failed to validate winEr %d.\n", winEr));
         fSetFlags |= SDC_ALLOW_CHANGES;
     }
@@ -1660 +1664 @@
     if (winEr != ERROR_SUCCESS)
     {
-        WARN(("VBoxTray:(WDDM) pfnSetDisplayConfig Failed to validate winEr %d.\n", winEr));
+        LogFlowFunc(("pfnSetDisplayConfig Failed to validate winEr %d.\n", winEr));
     }
 
@@ -1684 +1688 @@
 #endif
         default:
-            WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            LogFlowFunc(("unknown mode (%d)\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -1703 +1707 @@
 #endif
         default:
-            WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            LogFlowFunc(("unknown mode (%d)\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -1733 +1737 @@
         return NO_ERROR;
     }
-    WARN(("VBoxTray: pfnD3DKMTEscape VBOXESC_CONFIGURETARGETS failed Status 0x%x\n", Status));
+    LogFlowFunc(("pfnD3DKMTEscape VBOXESC_CONFIGURETARGETS failed Status 0x%x\n", Status));
     return Status;
 }
@@ -1742 +1746 @@
     if (NumDevices == 0)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
         return ERROR_GEN_FAILURE;
     }
@@ -1754 +1758 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed, %d\n", winEr));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed, %d\n", winEr));
         return winEr;
     }
 
     if (NumDevices != DevNum)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
 
 
@@ -1766 +1770 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfConfigureTargetsWDDM failed winEr 0x%x\n", winEr));
+        LogFlowFunc(("vboxDispIfConfigureTargetsWDDM failed winEr 0x%x\n", winEr));
         return winEr;
     }
@@ -1772 +1776 @@
     if (!cConnected)
     {
-        Log(("VBoxTray: all targets already connected, nothing to do\n"));
+        LogFlowFunc(("all targets already connected, nothing to do\n"));
         return NO_ERROR;
     }
@@ -1778 +1782 @@
     winEr = vboxDispIfWaitDisplayDataInited(pOp, NULL);
     if (winEr != NO_ERROR)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: vboxDispIfWaitDisplayDataInited failed winEr 0x%x\n", winEr));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: vboxDispIfWaitDisplayDataInited failed winEr 0x%x\n", winEr));
 
     DWORD NewNumDevices = VBoxGetDisplayConfigCount();
     if (NewNumDevices == 0)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: Zero devices found\n"));
         return ERROR_GEN_FAILURE;
     }
 
     if (NewNumDevices != NumDevices)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != NewNumDevices(%d)\n", NumDevices, NewNumDevices));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: NumDevices(%d) != NewNumDevices(%d)\n", NumDevices, NewNumDevices));
 
     DISPLAY_DEVICE *paNewDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NewNumDevices);
@@ -1798 +1802 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed for new devices, %d\n", winEr));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: VBoxGetDisplayConfig failed for new devices, %d\n", winEr));
         return winEr;
     }
 
     if (NewNumDevices != NewDevNum)
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: NewNumDevices(%d) != NewDevNum(%d)\n", NewNumDevices, NewDevNum));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: NewNumDevices(%d) != NewDevNum(%d)\n", NewNumDevices, NewDevNum));
 
     DWORD minDevNum = RT_MIN(DevNum, NewDevNum);
@@ -1821 +1825 @@
     {
         /* this is something we would not regularly expect */
-        WARN(("VBoxTray: all targets already have proper config, nothing to do\n"));
+        LogFlowFunc(("all targets already have proper config, nothing to do\n"));
         return NO_ERROR;
     }
@@ -1829 +1833 @@
         winEr = vboxDispIfWddmEnableDisplaysTryingTopology(pOp->pIf, cIds, pIds, FALSE);
         if (winEr != NO_ERROR)
-            WARN(("VBoxTray: vboxDispIfWddmEnableDisplaysTryingTopology failed to record current settings, %d, ignoring\n", winEr));
+            LogFlowFunc(("vboxDispIfWddmEnableDisplaysTryingTopology failed to record current settings, %d, ignoring\n", winEr));
     }
     else
@@ -1837 +1841 @@
             winEr = vboxDispIfWddmResizeDisplayVista(paNewDeviceModes, paNewDisplayDevices, NewDevNum, i, FALSE, TRUE);
             if (winEr != NO_ERROR)
-                WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp: vboxDispIfWddmResizeDisplayVista failed winEr 0x%x\n", winEr));
+                LogFlowFunc(("vboxDispIfResizeStartedWDDMOp: vboxDispIfWddmResizeDisplayVista failed winEr 0x%x\n", winEr));
         }
     }
@@ -1852 +1856 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfOpBegin failed winEr 0x%x\n", winEr));
+        LogFlowFunc(("vboxDispIfOpBegin failed winEr 0x%x\n", winEr));
         return winEr;
     }
@@ -1859 +1863 @@
     if (winEr != NO_ERROR)
     {
-        WARN(("VBoxTray: vboxDispIfResizeStartedWDDMOp failed winEr 0x%x\n", winEr));
+        LogFlowFunc(("vboxDispIfResizeStartedWDDMOp failed winEr 0x%x\n", winEr));
     }
 
@@ -1881 +1885 @@
 #endif
         default:
-            WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
+            LogFlowFunc(("unknown mode (%d)\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -1905 +1909 @@
             bool bSupported = true;
             *(uintptr_t *)&pIf->modeData.xpdm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
-            Log((__FUNCTION__": pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
+            LogFlowFunc(("pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
             bSupported &= !!(pIf->modeData.xpdm.pfnChangeDisplaySettingsEx);
 
             if (!bSupported)
             {
-                WARN((__FUNCTION__": pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
+                LogFlowFunc(("pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
                 err = ERROR_NOT_SUPPORTED;
             }
@@ -1916 +1920 @@
         else
         {
-            WARN((__FUNCTION__": failed to get USER32 handle, err (%d)\n", GetLastError()));
+            LogFlowFunc(("failed to get USER32 handle, err (%d)\n", GetLastError()));
             err = ERROR_NOT_SUPPORTED;
         }
@@ -1922 +1926 @@
     else
     {
-        WARN((__FUNCTION__": can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
+        LogFlowFunc(("can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
         err = ERROR_NOT_SUPPORTED;
     }
@@ -1952 +1956 @@
     {
         case VBOXDISPIF_MODE_XPDM_NT4:
-            Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_XPDM_NT4\n"));
+            LogFlowFunc(("request to switch to VBOXDISPIF_MODE_XPDM_NT4\n"));
             err = vboxDispIfSwitchToXPDM_NT4(pIf);
             if (err == NO_ERROR)
             {
-                Log((__FUNCTION__": successfully switched to XPDM_NT4 mode\n"));
+                LogFlowFunc(("successfully switched to XPDM_NT4 mode\n"));
                 pIf->enmMode = VBOXDISPIF_MODE_XPDM_NT4;
             }
             else
-                WARN((__FUNCTION__": failed to switch to XPDM_NT4 mode, err (%d)\n", err));
+                LogFlowFunc(("failed to switch to XPDM_NT4 mode, err (%d)\n", err));
             break;
         case VBOXDISPIF_MODE_XPDM:
-            Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_XPDM\n"));
+            LogFlowFunc(("request to switch to VBOXDISPIF_MODE_XPDM\n"));
             err = vboxDispIfSwitchToXPDM(pIf);
             if (err == NO_ERROR)
             {
-                Log((__FUNCTION__": successfully switched to XPDM mode\n"));
+                LogFlowFunc(("successfully switched to XPDM mode\n"));
                 pIf->enmMode = VBOXDISPIF_MODE_XPDM;
             }
             else
-                WARN((__FUNCTION__": failed to switch to XPDM mode, err (%d)\n", err));
+                LogFlowFunc(("failed to switch to XPDM mode, err (%d)\n", err));
             break;
 #ifdef VBOX_WITH_WDDM
         case VBOXDISPIF_MODE_WDDM:
         {
-            Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_WDDM\n"));
+            LogFlowFunc(("request to switch to VBOXDISPIF_MODE_WDDM\n"));
             err = vboxDispIfSwitchToWDDM(pIf);
             if (err == NO_ERROR)
             {
-                Log((__FUNCTION__": successfully switched to WDDM mode\n"));
+                LogFlowFunc(("successfully switched to WDDM mode\n"));
                 pIf->enmMode = VBOXDISPIF_MODE_WDDM;
             }
             else
-                WARN((__FUNCTION__": failed to switch to WDDM mode, err (%d)\n", err));
+                LogFlowFunc(("failed to switch to WDDM mode, err (%d)\n", err));
             break;
         }
         case VBOXDISPIF_MODE_WDDM_W7:
         {
-            Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_WDDM_W7\n"));
+            LogFlowFunc(("request to switch to VBOXDISPIF_MODE_WDDM_W7\n"));
             err = vboxDispIfSwitchToWDDM_W7(pIf);
             if (err == NO_ERROR)
             {
-                Log((__FUNCTION__": successfully switched to WDDM mode\n"));
+                LogFlowFunc(("successfully switched to WDDM mode\n"));
                 pIf->enmMode = VBOXDISPIF_MODE_WDDM_W7;
             }
             else
-                WARN((__FUNCTION__": failed to switch to WDDM mode, err (%d)\n", err));
+                LogFlowFunc(("failed to switch to WDDM mode, err (%d)\n", err));
             break;
         }
@@ -2024 +2028 @@
 #ifdef VBOX_DISPIF_WITH_OPCONTEXT
             else
-                WARN(("VBoxTray: vboxDispKmtCreateContext failed hr 0x%x", hr));
+                LogFlowFunc(("vboxDispKmtCreateContext failed hr 0x%x", hr));
 
             vboxDispKmtDestroyDevice(&pSeamless->modeData.wddm.Device);
         }
         else
-            WARN(("VBoxTray: vboxDispKmtCreateDevice failed hr 0x%x", hr));
+            LogFlowFunc(("vboxDispKmtCreateDevice failed hr 0x%x", hr));
 
         vboxDispKmtCloseAdapter(&pSeamless->modeData.wddm.Adapter);
@@ -2066 +2070 @@
         return ERROR_SUCCESS;
 
-    WARN(("VBoxTray: pfnD3DKMTEscape Seamless failed Status 0x%x\n", Status));
+    LogFlowFunc(("pfnD3DKMTEscape Seamless failed Status 0x%x\n", Status));
     return Status;
 }
@@ -2086 +2090 @@
 #endif
         default:
-            WARN(("VBoxTray: VBoxDispIfSeamlesCreate: invalid mode %d\n", pIf->enmMode));
+            LogFlowFunc(("VBoxDispIfSeamlesCreate: invalid mode %d\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }
@@ -2108 +2112 @@
 #endif
         default:
-            WARN(("VBoxTray: VBoxDispIfSeamlesTerm: invalid mode %d\n", pIf->enmMode));
+            LogFlowFunc(("VBoxDispIfSeamlesTerm: invalid mode %d\n", pIf->enmMode));
             winEr = ERROR_INVALID_PARAMETER;
             break;
@@ -2125 +2129 @@
     if (pData->escapeCode != VBOXESC_SETVISIBLEREGION)
     {
-        WARN(("VBoxTray: invalid escape code for Seamless submit %d\n", pData->escapeCode));
+        LogFlowFunc(("invalid escape code for Seamless submit %d\n", pData->escapeCode));
         return ERROR_INVALID_PARAMETER;
     }
@@ -2140 +2144 @@
 #endif
         default:
-            WARN(("VBoxTray: VBoxDispIfSeamlesSubmit: invalid mode %d\n", pIf->enmMode));
+            LogFlowFunc(("VBoxDispIfSeamlesSubmit: invalid mode %d\n", pIf->enmMode));
             return ERROR_INVALID_PARAMETER;
     }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#define _WIN32_WINNT 0x0500
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 #include "VBoxSeamless.h"
+
+#include <malloc.h>
+
+#include <iprt/assert.h>
+#ifdef VBOX_WITH_WDDM
+# include <iprt/asm.h>
+#endif
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+#include <VBox/VMMDev.h>
+
+#include <VBoxDisplay.h>
+#include <VBoxGuestInternal.h>
 #include <VBoxHook.h>
-#include <VBoxDisplay.h>
-#include <VBox/VMMDev.h>
-#include <iprt/assert.h>
-#include <malloc.h>
-#include <VBoxGuestInternal.h>
-#ifdef VBOX_WITH_WDDM
-#include <iprt/asm.h>
-#endif
+
+
 
 typedef struct _VBOXDISPLAYCONTEXT
@@ -57 +67 @@
 int VBoxDisplayInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxTray: VBoxDisplayInit ...\n"));
+    LogFlowFunc(("VBoxDisplayInit ...\n"));
 
     OSVERSIONINFO OSinfo;
@@ -69 +79 @@
     if (NULL == hUser)
     {
-        Log(("VBoxTray: VBoxDisplayInit: Could not get module handle of USER32.DLL!\n"));
+        LogFlowFunc(("Could not get module handle of USER32.DLL!\n"));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -75 +85 @@
     {
         *(uintptr_t *)&gCtx.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
-        Log(("VBoxTray: VBoxDisplayInit: pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
+        LogFlowFunc(("pfnChangeDisplaySettingsEx = %p\n", gCtx.pfnChangeDisplaySettingsEx));
 
         *(uintptr_t *)&gCtx.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA");
-        Log(("VBoxTray: VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
+        LogFlowFunc(("pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
 
 #ifdef VBOX_WITH_WDDM
@@ -84 +94 @@
         {
             /* this is vista and up, check if we need to switch the display driver if to WDDM mode */
-            Log(("VBoxTray: VBoxDisplayInit: this is Windows Vista and up\n"));
+            LogFlowFunc(("this is Windows Vista and up\n"));
             VBOXDISPLAY_DRIVER_TYPE enmType = getVBoxDisplayDriverType (&gCtx);
             if (enmType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
             {
-                Log(("VBoxTray: VBoxDisplayInit: WDDM driver is installed, switching display driver if to WDDM mode\n"));
+                LogFlowFunc(("WDDM driver is installed, switching display driver if to WDDM mode\n"));
                 /* this is hacky, but the most easiest way */
                 VBOXDISPIF_MODE enmMode = (OSinfo.dwMajorVersion > 6 || OSinfo.dwMinorVersion > 0) ? VBOXDISPIF_MODE_WDDM_W7 : VBOXDISPIF_MODE_WDDM;
                 DWORD err = VBoxDispIfSwitchMode(const_cast<PVBOXDISPIF>(&pEnv->dispIf), enmMode, NULL /* old mode, we don't care about it */);
                 if (err == NO_ERROR)
-                    Log(("VBoxTray: VBoxDisplayInit: DispIf switched to WDDM mode successfully\n"));
+                    LogFlowFunc(("DispIf switched to WDDM mode successfully\n"));
                 else
-                    Log(("VBoxTray: VBoxDisplayInit: Failed to switch DispIf to WDDM mode, err (%d)\n", err));
+                    LogFlowFunc(("Failed to switch DispIf to WDDM mode, err (%d)\n", err));
             }
         }
@@ -106 +116 @@
     else                                /* Unsupported platform */
     {
-        Log(("VBoxTray: VBoxDisplayInit: Warning, display for platform not handled yet!\n"));
+        LogFlowFunc(("Warning, display for platform not handled yet!\n"));
         return VERR_NOT_IMPLEMENTED;
     }
@@ -118 +128 @@
         gCtx.fAnyX = TRUE;
 
-    Log(("VBoxTray: VBoxDisplayInit: Display init successful\n"));
+    LogFlowFunc(("Display init successful\n"));
 
     *pfStartThread = true;
@@ -149 +159 @@
         dispDevice.cb = sizeof(DISPLAY_DEVICE);
 
-        Log(("VBoxTray: isVBoxDisplayDriverActive: Checking for active VBox display driver (W2K+) ...\n"));
+        LogFlowFunc(("isVBoxDisplayDriverActive: Checking for active VBox display driver (W2K+) ...\n"));
 
         while (EnumDisplayDevices(NULL,
@@ -156 +166 @@
                                   0))
         {
-            Log(("VBoxTray: isVBoxDisplayDriverActive: DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
+            LogFlowFunc(("isVBoxDisplayDriverActive: DevNum:%d\nName:%s\nString:%s\nID:%s\nKey:%s\nFlags=%08X\n\n",
                           devNum,
                           &dispDevice.DeviceName[0],
@@ -166 +176 @@
             if (dispDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
             {
-                Log(("VBoxTray: isVBoxDisplayDriverActive: Primary device\n"));
+                LogFlowFunc(("isVBoxDisplayDriverActive: Primary device\n"));
 
                 if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
@@ -191 +201 @@
     else    /* This must be NT 4 or something really old, so don't use EnumDisplayDevices() here  ... */
     {
-        Log(("VBoxTray: isVBoxDisplayDriverActive: Checking for active VBox display driver (NT or older) ...\n"));
+        LogFlowFunc(("isVBoxDisplayDriverActive: Checking for active VBox display driver (NT or older) ...\n"));
 
         DEVMODE tempDevMode;
@@ -249 +259 @@
             if(!(displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE))
             {
-                LogRel(("VBoxTray: Secondary Monitor with ID=%d and name=%s Not Enabled. Enabling it.\n", Id, displayDevice.DeviceName));
+                LogRel(("Secondary Monitor with ID=%d and name=%s Not Enabled. Enabling it.\n", Id, displayDevice.DeviceName));
                 deviceMode.dmPosition.x = paDeviceModes[0].dmPelsWidth;
                 deviceMode.dmPosition.y = 0;
@@ -272 +282 @@
                 if (aWidth !=0 && aHeight != 0)
                 {
-                    LogRel(("VBoxTray: Display : %s , Change Height: %d & Width: %d\n", displayDevice.DeviceName, aWidth, aHeight));
+                    LogRel(("Display : %s , Change Height: %d & Width: %d\n", displayDevice.DeviceName, aWidth, aHeight));
                     deviceMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL
                                           | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS;
@@ -281 +291 @@
                 if (aPosX != 0 || aPosY != 0)
                 {
-                    LogRel(("VBoxTray: Display: %s PosX: %d, PosY: %d\n", displayDevice.DeviceName, aPosX, aPosY));
+                    LogRel(("Display: %s PosX: %d, PosY: %d\n", displayDevice.DeviceName, aPosX, aPosY));
                     deviceMode.dmFields |=  DM_POSITION;
                     deviceMode.dmPosition.x = aPosX;
@@ -294 +304 @@
         else /* Request is there to disable the monitor with ID = Id*/
         {
-            LogRel(("VBoxTray: Disable the Display: %d\n", displayDevice.DeviceName));
+            LogRel(("Disable the Display: %d\n", displayDevice.DeviceName));
 
             DEVMODE deviceModeTmp;
@@ -322 +332 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     {
-        Log(("VBoxTray: ResizeDisplayDevice: [%d] %s\n", i, DisplayDevice.DeviceName));
+        LogFlowFunc(("ResizeDisplayDevice: [%d] %s\n", i, DisplayDevice.DeviceName));
 
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("VBoxTray: ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
+            LogFlowFunc(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -332 +342 @@
         {
 
-            Log(("VBoxTray: ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
+            LogFlowFunc(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -358 +368 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     {
-        Log(("VBoxTray: ResizeDisplayDevice: [%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
+        LogFlowFunc(("ResizeDisplayDevice: [%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
 
         BOOL bFetchDevice = FALSE;
@@ -364 +374 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("VBoxTray: ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
+            LogFlowFunc(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             DevPrimaryNum = DevNum;
             bFetchDevice = TRUE;
@@ -371 +381 @@
         {
 
-            Log(("VBoxTray: ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
+            LogFlowFunc(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             bFetchDevice = TRUE;
         }
@@ -379 +389 @@
             if (DevNum >= NumDevices)
             {
-                WARN(("VBoxTray: ResizeDisplayDevice: %d >= %d\n", NumDevices, DevNum));
+                LogFlowFunc(("ResizeDisplayDevice: %d >= %d\n", NumDevices, DevNum));
                 return ERROR_BUFFER_OVERFLOW;
             }
@@ -394 +404 @@
                  ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings error %d\n", GetLastError ()));
+                LogFlowFunc(("ResizeDisplayDevice: EnumDisplaySettings error %d\n", GetLastError ()));
             }
 
@@ -412 +422 @@
                      * Do not return here, ignore the error and set the display info to 0x0x0.
                      */
-                    Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) error %d\n", GetLastError ()));
+                    LogFlowFunc(("ResizeDisplayDevice: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) error %d\n", GetLastError ()));
                 }
             }
@@ -440 +450 @@
     DWORD dmFields = 0;
 
-    Log(("VBoxTray: ResizeDisplayDevice Width= %d, Height=%d , PosX=%d and PosY=%d \
+    LogFlowFunc(("ResizeDisplayDevice Width= %d, Height=%d , PosX=%d and PosY=%d \
          fEnabled = %d, fExtDisSup = %d\n",
           Width, Height, dwNewPosX, dwNewPosY, fEnabled, fExtDispSup));
@@ -453 +463 @@
     if (NumDevices == 0 || Id >= NumDevices)
     {
-        WARN(("VBoxTray: ResizeDisplayDevice: Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        LogFlowFunc(("ResizeDisplayDevice: Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
         return FALSE;
     }
 
-    Log(("VBoxTray: ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    LogFlowFunc(("ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
 
     DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
@@ -467 +477 @@
     if (dwStatus != NO_ERROR)
     {
-        WARN(("VBoxTray: ResizeDisplayDevice: VBoxGetDisplayConfig failed, %d\n", dwStatus));
+        LogFlowFunc(("ResizeDisplayDevice: VBoxGetDisplayConfig failed, %d\n", dwStatus));
         return dwStatus;
     }
 
     if (NumDevices != DevNum)
-        WARN(("VBoxTray: ResizeDisplayDevice: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
+        LogFlowFunc(("ResizeDisplayDevice: NumDevices(%d) != DevNum(%d)\n", NumDevices, DevNum));
 
     DWORD i = 0;
@@ -480 +490 @@
         if (fExtDispSup)
         {
-            LogRel(("VBoxTray: Extended Display Support.\n"));
-            Log(("VBoxTray: ResizeDisplayDevice1: %dx%dx%d at %d,%d . Id = %d and DevNum=%d, fEnabled=%d\n",
+            LogRel(("Extended Display Support.\n"));
+            LogFlowFunc(("ResizeDisplayDevice1: %dx%dx%d at %d,%d . Id = %d and DevNum=%d, fEnabled=%d\n",
                   paDeviceModes[Id].dmPelsWidth,
                   paDeviceModes[Id].dmPelsHeight,
@@ -491 +501 @@
         else
         {
-            LogRel(("VBoxTray: NO Ext Display Support \n"));
+            LogRel(("NO Ext Display Support \n"));
         }
 
@@ -503 +513 @@
     if (paDisplayDevices[Id].StateFlags & DISPLAY_DEVICE_ACTIVE)
     {
-        LogRel(("VBoxTray: Display with ID=%d already enabled\n", Id));
+        LogRel(("Display with ID=%d already enabled\n", Id));
         fDispAlreadyEnabled = TRUE;
     }
@@ -559 +569 @@
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
-        LogRel(("VBoxTray: Already at desired resolution. No Change.\n"));
+        LogRel(("Already at desired resolution. No Change.\n"));
         return FALSE;
     }
@@ -568 +578 @@
     for (i = 0; i < NumDevices; i++)
     {
-        Log(("VBoxTray: ResizeDisplayDevice: [%d]: %d,%d %dx%d\n",
+        LogFlowFunc(("ResizeDisplayDevice: [%d]: %d,%d %dx%d\n",
                 i, paRects[i].left, paRects[i].top,
                 paRects[i].right - paRects[i].left,
@@ -597 +607 @@
             if (!(paDeviceModes[i].dmFields & DM_BITSPERPEL))
             {
-                WARN(("VBoxTray: (WDDM) no DM_BITSPERPEL\n"));
+                LogFlowFunc(("no DM_BITSPERPEL\n"));
                 paDeviceModes[i].dmFields |= DM_BITSPERPEL;
                 paDeviceModes[i].dmBitsPerPel = 32;
             }
 
-            Log(("VBoxTray: (WDDM) ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
+            LogFlowFunc(("ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
                   gCtx.pfnChangeDisplaySettingsEx,
                   paDeviceModes[i].dmPelsWidth,
@@ -611 +621 @@
         }
 
-        Log(("VBoxTray: (WDDM) Request to resize the displa\n"));
+        LogFlowFunc(("Request to resize the displa\n"));
         DWORD err = VBoxDispIfResizeModes(&pCtx->pEnv->dispIf, Id, fEnabled, fExtDispSup, paDisplayDevices, paDeviceModes, DevNum);
         if (err == NO_ERROR || err != ERROR_RETRY)
         {
             if (err == NO_ERROR)
-                Log(("VBoxTray: VBoxDisplayThread: (WDDM) VBoxDispIfResizeModes succeeded\n"));
+                LogFlowFunc(("VBoxDispIfResizeModes succeeded\n"));
             else
-               WARN(("VBoxTray: VBoxDisplayThread: (WDDM) Failure VBoxDispIfResizeModes (%d)\n", err));
+               LogFlowFunc(("Failure VBoxDispIfResizeModes (%d)\n", err));
             return FALSE;
         }
 
-        Log(("VBoxTray: ResizeDisplayDevice: (WDDM) RETRY requested\n"));
+        LogFlowFunc(("ResizeDisplayDevice: RETRY requested\n"));
         return TRUE;
     }
@@ -635 +645 @@
         tempDevMode.dmSize = sizeof(DEVMODE);
         EnumDisplaySettings((LPSTR)paDisplayDevices[i].DeviceName, 0xffffff, &tempDevMode);
-        Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
+        LogFlowFunc(("ResizeDisplayDevice: EnumDisplaySettings last error %d\n", GetLastError ()));
     }
 
@@ -658 +668 @@
         }
 
-        Log(("VBoxTray: ResizeDisplayDevice: pfnChangeDisplaySettingsEx Current MonitorId=%d: %dx%dx%d at %d,%d\n",
+        LogFlowFunc(("ResizeDisplayDevice: pfnChangeDisplaySettingsEx Current MonitorId=%d: %dx%dx%d at %d,%d\n",
               i,
               paDeviceModes[i].dmPelsWidth,
@@ -668 +678 @@
         LONG status = gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,
                                         &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
-        Log(("VBoxTray: ResizeDisplayDevice: ChangeDisplaySettingsEx position status %d, err %d\n", status, GetLastError ()));
-    }
-
-    Log(("VBoxTray: Enable And Resize Device. Id = %d, Width=%d Height=%d, \
+        LogFlowFunc(("ResizeDisplayDevice: ChangeDisplaySettingsEx position status %d, err %d\n", status, GetLastError ()));
+    }
+
+    LogFlowFunc(("Enable And Resize Device. Id = %d, Width=%d Height=%d, \
          dwNewPosX = %d, dwNewPosY = %d fEnabled=%d & fExtDispSupport = %d \n",
          Id, Width, Height, dwNewPosX, dwNewPosY, fEnabled, fExtDispSup));
@@ -693 +703 @@
 unsigned __stdcall VBoxDisplayThread(void *pInstance)
 {
-    Log(("VBoxTray: VBoxDisplayThread: Entered\n"));
+    LogFlowFunc(("Entered\n"));
 
     VBOXDISPLAYCONTEXT *pCtx = (VBOXDISPLAYCONTEXT *)pInstance;
@@ -705 +715 @@
     if (!DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - or) failed, thread exiting\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask - or) failed, thread exiting\n"));
         return 0;
     }
@@ -722 +732 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            /*Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl succeeded\n"));*/
+            /*LogFlowFunc(("DeviceIOControl succeeded\n"));*/
 
             if (NULL == pCtx) {
-                Log(("VBoxTray: VBoxDisplayThread: Invalid context detected!\n"));
+                LogFlowFunc(("Invalid context detected!\n"));
                 break;
             }
 
             if (NULL == pCtx->pEnv) {
-                Log(("VBoxTray: VBoxDisplayThread: Invalid context environment detected!\n"));
+                LogFlowFunc(("Invalid context environment detected!\n"));
                 break;
             }
@@ -738 +748 @@
                 break;
 
-            /*Log(("VBoxTray: VBoxDisplayThread: checking event\n"));*/
+            /*LogFlowFunc(("checking event\n"));*/
 
             /* did we get the right event? */
             if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
             {
-                Log(("VBoxTray: VBoxDisplayThread: going to get display change information\n"));
+                LogFlowFunc(("going to get display change information\n"));
                 BOOL fDisplayChangeQueried;
 
@@ -763 +773 @@
                if (!fDisplayChangeQueried)
                {
-                    Log(("VBoxTray: Extended Display Not Supported. Trying VMMDevDisplayChangeRequest2\n"));
+                    LogFlowFunc(("Extended Display Not Supported. Trying VMMDevDisplayChangeRequest2\n"));
                     fExtDispSup = FALSE; /* Extended display Change request is not supported */
 
@@ -780 +790 @@
                 if (!fDisplayChangeQueried)
                 {
-                    Log(("VBoxTray: Extended Display Not Supported. Trying VMMDevDisplayChangeRequest\n"));
+                    LogFlowFunc(("Extended Display Not Supported. Trying VMMDevDisplayChangeRequest\n"));
                     fExtDispSup = FALSE; /*Extended display Change request is not supported */
                     /* Try the old version of the request for old VBox hosts. */
@@ -801 +811 @@
                     for (;;)
                     {
-                        Log(("VBoxTray: VBoxDisplayThread: VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
+                        LogFlowFunc(("VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display));
 
                         /*
@@ -810 +820 @@
 
                         if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
-                            Log(("VBoxTray: VBoxDisplayThread: Detected WDDM Driver\n"));
+                            LogFlowFunc(("Detected WDDM Driver\n"));
 
                         if (enmDriverType != VBOXDISPLAY_DRIVER_TYPE_UNKNOWN)
@@ -817 +827 @@
 #endif
                         {
-                            Log(("VBoxTray: VBoxDisplayThread: Display driver is active!\n"));
+                            LogFlowFunc(("Display driver is active!\n"));
 
                             if (pCtx->pfnChangeDisplaySettingsEx != 0)
                             {
-                                Log(("VBoxTray: VBoxDisplayThread: Detected W2K or later\n"));
+                                LogFlowFunc(("Detected W2K or later\n"));
                                 /* W2K or later. */
-                                Log(("DisplayChangeReqEx parameters  aDisplay=%d x xRes=%d x yRes=%d x bpp=%d x SecondayMonEnb=%d x NewOriginX=%d x NewOriginY=%d x ChangeOrigin=%d\n",
+                                LogFlowFunc(("DisplayChangeReqEx parameters  aDisplay=%d x xRes=%d x yRes=%d x bpp=%d x SecondayMonEnb=%d x NewOriginX=%d x NewOriginY=%d x ChangeOrigin=%d\n",
                                      displayChangeRequest.display,
                                      displayChangeRequest.xres,
@@ -843 +853 @@
                                                          ))
                                 {
-                                    Log(("ResizeDipspalyDevice return 0\n"));
+                                    LogFlowFunc(("ResizeDipspalyDevice return 0\n"));
                                     break;
                                 }
@@ -850 +860 @@
                             else
                             {
-                                Log(("VBoxTray: VBoxDisplayThread: Detected NT\n"));
+                                LogFlowFunc(("Detected NT\n"));
 
                                 /* Single monitor NT. */
@@ -860 +870 @@
                                 if (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode))
                                 {
-                                    Log(("VBoxTray: VBoxDisplayThread: Current mode: %d x %d x %d at %d,%d\n",
+                                    LogFlowFunc(("Current mode: %d x %d x %d at %d,%d\n",
                                           devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y));
 
@@ -879 +889 @@
                                     {
                                         /* All zero values means a forced mode reset. Do nothing. */
-                                        Log(("VBoxTray: VBoxDisplayThread: Forced mode reset\n"));
+                                        LogFlowFunc(("Forced mode reset\n"));
                                     }
 
@@ -887 +897 @@
                                         && devMode.dmBitsPerPel == displayChangeRequest.bpp)
                                     {
-                                        Log(("VBoxTray: VBoxDisplayThread: already at desired resolution\n"));
+                                        LogFlowFunc(("already at desired resolution\n"));
                                         break;
                                     }
@@ -905 +915 @@
                                         devMode.dmBitsPerPel = displayChangeRequest.bpp;
 
-                                    Log(("VBoxTray: VBoxDisplayThread: setting new mode %d x %d, %d BPP\n",
+                                    LogFlowFunc(("setting new mode %d x %d, %d BPP\n",
                                          devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel));
 
@@ -912 +922 @@
                                     if (status != DISP_CHANGE_SUCCESSFUL)
                                     {
-                                        Log(("VBoxTray: VBoxDisplayThread: error from ChangeDisplaySettings: %d\n", status));
+                                        LogFlowFunc(("error from ChangeDisplaySettings: %d\n", status));
 
                                         if (status == DISP_CHANGE_BADMODE)
@@ -928 +938 @@
                                 else
                                 {
-                                    Log(("VBoxTray: VBoxDisplayThread: error from EnumDisplaySettings: %d\n", GetLastError ()));
+                                    LogFlowFunc(("error from EnumDisplaySettings: %d\n", GetLastError ()));
                                     break;
                                 }
@@ -935 +945 @@
                         else
                         {
-                            Log(("VBoxTray: VBoxDisplayThread: vboxDisplayDriver is not active\n"));
+                            LogFlowFunc(("vboxDisplayDriver is not active\n"));
                         }
 
@@ -949 +959 @@
                 else
                 {
-                    Log(("VBoxTray: VBoxDisplayThread: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                    LogFlowFunc(("error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
                     /* sleep a bit to not eat too much CPU while retrying */
                     /* are we supposed to stop? */
@@ -965 +975 @@
         {
 #ifndef DEBUG_andy /* Too noisy for me. */
-            Log(("VBoxTray: VBoxDisplayThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            LogFlowFunc(("error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 #endif
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -982 +992 @@
     maskInfo.u32NotMask = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED;
     if (!DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
-        Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - not) failed\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask - not) failed\n"));
     PostMessage(ghwndToolWindow, WM_VBOX_GRAPHICS_UNSUPPORTED, 0, 0);
 
-    Log(("VBoxTray: VBoxDisplayThread: finished display change request thread\n"));
+    LogFlowFunc(("finished display change request thread\n"));
     return 0;
 }

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

@@ -22 +22 @@
 #include <iprt/semaphore.h>
 #include <iprt/uri.h>
+
+#ifdef LOG_GROUP
+# undef LOG_GROUP
+#endif
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
 
 #include "VBoxTray.h"

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

@@ -17 +17 @@
 #include <windows.h>
 #include <new> /* For bad_alloc. */
+
+#ifdef LOG_GROUP
+# undef LOG_GROUP
+#endif
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
 
 #include "VBoxTray.h"

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

@@ -25 +25 @@
 #include "VBox/GuestHost/DragAndDrop.h"
 #include "VBox/HostServices/DragAndDropSvc.h"
+
+#ifdef LOG_GROUP
+# undef LOG_GROUP
+#endif
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
 
 

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

@@ -21 +21 @@
 #include "VBoxHelpers.h"
 #include "VBoxDnD.h"
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
 
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 
 #include <VBox/VBoxGuestLib.h>
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
 
 
@@ -55 +62 @@
                                        5000 /* Time to display in msec */, NIIF_INFO);
                 if (RT_FAILURE(rc))
-                    Log(("VBoxTray: Guest Additions update found; however: could not show version notifier balloon tooltip! rc = %d\n", rc));
+                    LogFlowFunc(("Guest Additions update found; however: could not show version notifier balloon tooltip, rc=%Rrc\n", rc));
             }
 

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

@@ -32 +32 @@
 #include <iprt/mem.h>
 #include <VBoxGuestInternal.h>
+
+#include <VBox/VMMDev.h>
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
 
 
@@ -229 +236 @@
     AssertPtrReturnVoid(pInstance);
 
-    LogFunc(("Stopping pInstance=%p\n", pInstance));
+    LogFlowFunc(("Stopping pInstance=%p\n", pInstance));
 
     /* Shut down local IPC server. */
@@ -239 +246 @@
         int rc2 = RTLocalIpcServerCancel(pCtx->hServer);
         if (RT_FAILURE(rc2))
-            LogFunc(("Cancelling current listening call failed with rc=%Rrc\n", rc2));
+            LogFlowFunc(("Cancelling current listening call failed with rc=%Rrc\n", rc2));
     }
 
@@ -252 +259 @@
             if (RT_FAILURE(rc2))
             {
-                LogFunc(("Stopping IPC session %p failed with rc=%Rrc\n",
+                LogFlowFunc(("Stopping IPC session %p failed with rc=%Rrc\n",
                          pSession, rc2));
                 /* Keep going. */
@@ -265 +272 @@
     AssertPtrReturnVoid(pInstance);
 
-    LogFunc(("Destroying pInstance=%p\n", pInstance));
+    LogFlowFunc(("Destroying pInstance=%p\n", pInstance));
 
     PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pInstance;
@@ -276 +283 @@
         rc = RTLocalIpcServerDestroy(pCtx->hServer);
         if (RT_FAILURE(rc))
-            LogFunc(("Unable to destroy IPC server, rc=%Rrc\n", rc));
+            LogFlowFunc(("Unable to destroy IPC server, rc=%Rrc\n", rc));
 
         int rc2 = RTCritSectLeave(&pCtx->CritSect);
@@ -283 +290 @@
     }
 
-    LogFunc(("Waiting for remaining IPC sessions to shut down ...\n"));
+    LogFlowFunc(("Waiting for remaining IPC sessions to shut down ...\n"));
 
     /* Wait for all IPC session threads to shut down. */
@@ -307 +314 @@
               ("Session thread list is not empty when it should\n"));
 
-    LogFunc(("All remaining IPC sessions shut down\n"));
+    LogFlowFunc(("All remaining IPC sessions shut down\n"));
 
     int rc2 = RTCritSectDelete(&pCtx->CritSect);
@@ -313 +320 @@
         rc = rc2;
 
-    LogFunc(("Destroyed pInstance=%p, rc=%Rrc\n",
+    LogFlowFunc(("Destroyed pInstance=%p, rc=%Rrc\n",
              pInstance, rc));
 }
@@ -331 +338 @@
     AssertReturn(hSession != NIL_RTLOCALIPCSESSION, VERR_INVALID_PARAMETER);
 
-    LogFunc(("pThis=%p\n", pThis));
+    LogFlowFunc(("pThis=%p\n", pThis));
 
     int rc = VINF_SUCCESS;
@@ -347 +354 @@
             if (rc == VERR_CANCELLED)
             {
-                LogFunc(("Session %p: Waiting for data cancelled\n", pThis));
+                LogFlowFunc(("Session %p: Waiting for data cancelled\n", pThis));
                 rc = VINF_SUCCESS;
                 break;
             }
             else
-                LogFunc(("Session %p: Waiting for session data failed with rc=%Rrc\n",
+                LogFlowFunc(("Session %p: Waiting for session data failed with rc=%Rrc\n",
                          pThis, rc));
         }
@@ -391 +398 @@
 
                 if (RT_FAILURE(rc))
-                    LogFunc(("Session %p: Handling command %RU32 failed with rc=%Rrc\n",
+                    LogFlowFunc(("Session %p: Handling command %RU32 failed with rc=%Rrc\n",
                              pThis, ipcHdr.uMsgType, rc));
             }
@@ -423 +430 @@
     }
 
-    LogFunc(("Session %p: Handler ended with rc=%Rrc\n",
+    LogFlowFunc(("Session %p: Handler ended with rc=%Rrc\n",
              pThis, rc));
 
@@ -431 +438 @@
     int rc2 = RTLocalIpcSessionClose(hSession);
     if (RT_FAILURE(rc2))
-        LogFunc(("Session %p: Failed closing session %p, rc=%Rrc\n", pThis, rc2));
+        LogFlowFunc(("Session %p: Failed closing session %p, rc=%Rrc\n", pThis, rc2));
 
     /*
@@ -449 +456 @@
     }
 
-    LogFunc(("Session %p: Terminated with rc=%Rrc, freeing ...\n",
+    LogFlowFunc(("Session %p: Terminated with rc=%Rrc, freeing ...\n",
              pThis, rc));
 
@@ -488 +495 @@
                 int rc2 = RTLocalIpcSessionClose(hSession);
                 if (RT_FAILURE(rc2))
-                    LogFunc(("Failed closing session %p, rc=%Rrc\n", pSession, rc2));
-
-                LogFunc(("Failed to create thread for session %p, rc=%Rrc\n", pSession, rc));
+                    LogFlowFunc(("Failed closing session %p, rc=%Rrc\n", pSession, rc2));
+
+                LogFlowFunc(("Failed to create thread for session %p, rc=%Rrc\n", pSession, rc));
                 RTMemFree(pSession);
             }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-// #define LOG_ENABLED
-
 #define _WIN32_WINNT 0x0501
 #include <windows.h>
@@ -29 +26 @@
 #include <iprt/ldr.h>
 
-#define LALOG(a) do { if (gCtx.fLogEnabled) LogRel(a); } while(0)
-#define LALOGFORCE(a) do { LogRel(a); } while(0)
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
+
 
 #define REG_KEY_LEN 1024
@@ -147 +149 @@
     if (lErr != ERROR_SUCCESS)
     {
-        LALOGFORCE(("LA: RegOpenKeyExW: failed [%ls]\n",
+        LogRel(("LA: RegOpenKeyExW: failed [%ls]\n",
                     pwszRegKey));
         return FALSE;
@@ -163 +165 @@
     if (lErr != ERROR_SUCCESS)
     {
-        LALOGFORCE(("LA: RegQueryValueExW: failed [%ls/%ls]\n",
+        LogRel(("LA: RegQueryValueExW: failed [%ls/%ls]\n",
                     pwszRegKey, pwszName));
         RegCloseKey(hKey);
@@ -171 +173 @@
     if (nRegData != sizeof(DWORD))
     {
-        LALOGFORCE(("LA: buffer overflow reg %d, [%ls]\n",
+        LogRel(("LA: buffer overflow reg %d, [%ls]\n",
                     nRegData, pwszRegKey));
         RegCloseKey(hKey);
@@ -179 +181 @@
     if (dwType != REG_DWORD)
     {
-        LALOGFORCE(("LA: wrong type %d, [%ls/%ls]\n",
+        LogRel(("LA: wrong type %d, [%ls/%ls]\n",
                     dwType, pwszRegKey, pwszName));
         RegCloseKey(hKey);
@@ -221 +223 @@
     if (dwErr != ERROR_SUCCESS)
     {
-        LALOG(("LA: Can't open registry key [%ls], error %d\n",
+        LogFlowFunc(("Can't open registry key [%ls], error %d\n",
                pwszRegKey, dwErr));
         return FALSE;
@@ -249 +251 @@
         if (dwRet == ERROR_NO_MORE_ITEMS)
         {
-            LALOG(("LA: Enumeration exhausted\n"));
+            LogFlowFunc(("Enumeration exhausted\n"));
             bRet = TRUE;
             break;
@@ -255 +257 @@
         else if (dwRet != ERROR_SUCCESS)
         {
-            LALOG(("LA: Enumeration failed, error %d\n",
+            LogFlowFunc(("Enumeration failed, error %d\n",
                    dwRet));
             bRet = FALSE;
@@ -263 +265 @@
         if ((type != REG_SZ) && (type != REG_EXPAND_SZ))
         {
-            LALOG(("LA: skipped type %d\n",
+            LogFlowFunc(("skipped type %d\n",
                    type));
             continue;
@@ -275 +277 @@
         if (RT_FAILURE(rc))
         {
-            LALOG(("LA: RTUtf16ToUtf8Ex for [%ls] rc %Rrc\n",
+            LogFlowFunc(("RTUtf16ToUtf8Ex for [%ls] rc %Rrc\n",
                     wszValueName, rc));
             continue;
@@ -283 +285 @@
         if (RTStrNICmp(szName, g_szCommandPrefix, RT_ELEMENTS(g_szCommandPrefix) - 1) != 0)
         {
-            LALOG(("LA: skipped prefix %s\n",
+            LogFlowFunc(("skipped prefix %s\n",
                    szName));
             continue;
@@ -293 +295 @@
         if (nIndex == 0)
         {
-            LALOG(("LA: skipped index %s\n",
+            LogFlowFunc(("skipped index %s\n",
                    szName));
             continue;
@@ -302 +304 @@
         if (!pEntry)
         {
-            LALOG(("LA: RTMemAlloc failed\n"));
+            LogFlowFunc(("RTMemAlloc failed\n"));
             bRet = FALSE;
             break;
@@ -336 +338 @@
         }
 
-        LALOG(("LA: added %d %ls\n",
+        LogFlowFunc(("added %d %ls\n",
                pEntry->u32Index, pEntry->wszCommandLine));
     }
@@ -346 +348 @@
     RTListForEach(listActions, pIter, ACTIONENTRY, nodeActionEntry)
     {
-        LALOG(("LA: [%u]: [%ls]\n",
+        LogFlowFunc(("[%u]: [%ls]\n",
                pIter->u32Index, pIter->wszCommandLine));
     }
@@ -356 +358 @@
     }
 
-    LALOG(("LA: action enum %d\n",
+    LogFlowFunc(("action enum %d\n",
            bRet));
 
@@ -364 +366 @@
 static void ActionExecutorExecuteActions(RTLISTANCHOR *listActions)
 {
-    LALOG(("LA: ExecuteActions\n"));
+    LogFlowFunc(("ExecuteActions\n"));
 
     ACTIONENTRY *pIter = NULL;
     RTListForEach(listActions, pIter, ACTIONENTRY, nodeActionEntry)
     {
-        LALOG(("LA: [%u]: [%ls]\n",
+        LogFlowFunc(("[%u]: [%ls]\n",
                pIter->u32Index, pIter->wszCommandLine));
 
@@ -388 +390 @@
                             &pi))                  // lpProcessInformation
         {
-            LALOG(("LA: Executing [%ls] failed, error %d\n",
+            LogFlowFunc(("Executing [%ls] failed, error %d\n",
                    pIter->wszCommandLine, GetLastError()));
         }
         else
         {
-            LALOG(("LA: Executing [%ls] succeeded\n",
+            LogFlowFunc(("Executing [%ls] succeeded\n",
                    pIter->wszCommandLine));
 
@@ -402 +404 @@
     }
 
-    LALOG(("LA: ExecuteActions leave\n"));
+    LogFlowFunc(("ExecuteActions leave\n"));
 }
 
@@ -457 +459 @@
     if (fFound)
     {
-        LALOG(("LA: GetVolatileEnvironmentKey: [%s]\n", szRegKey));
+        LogFlowFunc(("GetVolatileEnvironmentKey: [%s]\n", szRegKey));
 
         /* Convert szRegKey to Utf16 string. */
@@ -467 +469 @@
         if (RT_FAILURE(rc))
         {
-            LALOG(("LA: RTStrToUtf16Ex failed %Rrc\n", rc));
+            LogFlowFunc(("RTStrToUtf16Ex failed %Rrc\n", rc));
             fFound = FALSE;
         }
         else
         {
-            LALOG(("LA: unicode [%ls]\n", putf16Unicode));
+            LogFlowFunc(("unicode [%ls]\n", putf16Unicode));
         }
     }
     else
     {
-        LALOG(("LA: GetVolatileEnvironmentKey: not found\n"));
+        LogFlowFunc(("GetVolatileEnvironmentKey: not found\n"));
     }
 
@@ -502 +504 @@
     if (lErr != ERROR_SUCCESS)
     {
-        LALOG(("LA: RegOpenKeyExW: failed [%ls]\n",
+        LogFlowFunc(("RegOpenKeyExW: failed [%ls]\n",
                wszRegKey));
         return FALSE;
@@ -518 +520 @@
     if (lErr != ERROR_SUCCESS)
     {
-        LALOG(("LA: RegQueryValueExW: failed [%ls]\n",
+        LogFlowFunc(("RegQueryValueExW: failed [%ls]\n",
                wszRegKey));
         RegCloseKey(hKey);
@@ -526 +528 @@
     if (nRegData >= cbClientName)
     {
-        LALOG(("LA: buffer overflow reg %d, buffer %d, [%ls]\n",
+        LogFlowFunc(("buffer overflow reg %d, buffer %d, [%ls]\n",
                nRegData, cbClientName, wszRegKey));
         RegCloseKey(hKey);
@@ -534 +536 @@
     if (dwType != REG_SZ)
     {
-        LALOG(("LA: wrong type %d, [%ls]\n",
+        LogFlowFunc(("wrong type %d, [%ls]\n",
                dwType, wszRegKey));
         RegCloseKey(hKey);
@@ -611 +613 @@
                             &dwResult) == 0)
     {
-        LALOG(("LA: SendMessageTimeout failed, error %d\n", GetLastError()));
+        LogFlowFunc(("SendMessageTimeout failed, error %d\n", GetLastError()));
     }
 }
@@ -642 +644 @@
     if (!GetVolatileEnvironmentKey(wszRegKey, sizeof(wszRegKey)))
     {
-        LALOG(("LA: Failed to get 'Volatile Environment' registry key\n"));
+        LogFlowFunc(("Failed to get 'Volatile Environment' registry key\n"));
         return;
     }
@@ -658 +660 @@
     if (lRet != ERROR_SUCCESS)
     {
-        LALOG(("LA: Failed to open key [%ls], error %lu\n",
+        LogFlowFunc(("Failed to open key [%ls], error %lu\n",
                wszRegKey, lRet));
         return;
@@ -677 +679 @@
         if (RT_FAILURE(rc))
         {
-            LALOG(("LA: RTStrToUniEx failed %Rrc\n", rc));
+            LogFlowFunc(("RTStrToUniEx failed %Rrc\n", rc));
             break;
         }
@@ -691 +693 @@
         if (lRet != ERROR_SUCCESS)
         {
-            LALOG(("LA: RegSetValueExW failed error %lu for %s \n", lRet, g_pwszUTCINFOClientInfo[idx]));
+            LogFlowFunc(("RegSetValueExW failed error %lu for %s \n", lRet, g_pwszUTCINFOClientInfo[idx]));
         }
     }
@@ -716 +718 @@
 static void laDoAttach(VBOXLACONTEXT *pCtx)
 {
-    LALOG(("LA: laDoAttach\n"));
+    LogFlowFunc(("laDoAttach\n"));
 
     /* Hardcoded action. */
@@ -727 +729 @@
 static void laDoDetach(VBOXLACONTEXT *pCtx)
 {
-    LALOG(("LA: laDoDetach\n"));
+    LogFlowFunc(("laDoDetach\n"));
 
     /* Process configured actions. */
@@ -773 +775 @@
     if (RT_SUCCESS(rc))
     {
-        LALOG(("LA: laGetProperty: [%s]\n"
+        LogFlowFunc(("laGetProperty: [%s]\n"
                "            value: [%s]\n"
                "        timestamp: %lld ns\n",
@@ -782 +784 @@
     else if (rc == VERR_NOT_FOUND)
     {
-        LALOG(("LA: laGetProperty: not found [%s]\n", pszName));
+        LogFlowFunc(("laGetProperty: not found [%s]\n", pszName));
         RTMemFree(pvBuf);
     }
     else
     {
-        LALOG(("LA: Failed to retrieve the property value, error %Rrc\n", rc));
+        LogFlowFunc(("Failed to retrieve the property value, error %Rrc\n", rc));
         RTMemFree(pvBuf);
     }
@@ -879 +881 @@
     }
 
-    LALOG(("LA: laGetUint32: rc = %Rrc, [%s]\n",
+    LogFlowFunc(("laGetUint32: rc = %Rrc, [%s]\n",
            rc, pszName));
 
@@ -892 +894 @@
                            ppszValue);
 
-    LALOG(("LA: laGetString: rc = %Rrc, [%s]\n",
+    LogFlowFunc(("laGetString: rc = %Rrc, [%s]\n",
            rc, pszName));
 
@@ -905 +907 @@
                          pu32Value);
 
-    LALOG(("LA: laGetActiveClient: rc %Rrc, %d, %lld\n", rc, *pu32Value, *pu64Timestamp));
+    LogFlowFunc(("laGetActiveClient: rc %Rrc, %d, %lld\n", rc, *pu32Value, *pu64Timestamp));
 
     return rc;
@@ -915 +917 @@
      * If u32ActiveClientId is 0, then there is no connected clients.
      */
-    LALOG(("LA: laUpdateCurrentState: %u %lld\n",
+    LogFlowFunc(("laUpdateCurrentState: %u %lld\n",
             u32ActiveClientId, u64ActiveClientTS));
 
@@ -1017 +1019 @@
     }
 
-    LALOG(("LA: laUpdateCurrentState rc = %Rrc\n",
+    LogFlowFunc(("laUpdateCurrentState rc = %Rrc\n",
            rc));
 
@@ -1025 +1027 @@
 static int laWait(VBOXLACONTEXT *pCtx, uint64_t *pu64Timestamp, uint32_t u32Timeout)
 {
-    LALOG(("LA: laWait [%s]\n",
+    LogFlowFunc(("laWait [%s]\n",
            pCtx->activeClient.pszPropWaitPattern));
 
@@ -1034 +1036 @@
                               u32Timeout);
 
-    LALOG(("LA: laWait rc %Rrc\n",
+    LogFlowFunc(("laWait rc %Rrc\n",
            rc));
 
@@ -1064 +1066 @@
                          &pClientInfoMap[idx][LA_UTCINFO_PROP_VALUE]);
 
-         LALOG(("LA: laProcessClientInfo: read [%s], at %lld\n",
+         LogFlowFunc(("laProcessClientInfo: read [%s], at %lld\n",
                 pClientInfoMap[idx][LA_UTCINFO_PROP_VALUE], u64Timestamp));
 
         if (RT_FAILURE(rc))
         {
-            LALOG(("LA: laProcessClientInfo failed at %s\n", pClientInfoMap[idx][LA_UTCINFO_PROP_NAME]));
+            LogFlowFunc(("laProcessClientInfo failed at %s\n", pClientInfoMap[idx][LA_UTCINFO_PROP_NAME]));
             break;
         }
@@ -1108 +1110 @@
     if (RT_SUCCESS(rc))
     {
-        LALOG(("LA: laProcessAttach: read %d, at %lld\n",
+        LogFlowFunc(("laProcessAttach: read %d, at %lld\n",
                u32Attach, u64Timestamp));
 
@@ -1115 +1117 @@
             if (u32Attach != pCtx->activeClient.u32LastAttach)
             {
-                LALOG(("LA: laProcessAttach: changed\n"));
+                LogFlowFunc(("laProcessAttach: changed\n"));
 
                 /* Just do the last action. */
@@ -1126 +1128 @@
             else
             {
-                LALOG(("LA: laProcessAttach: same\n"));
+                LogFlowFunc(("laProcessAttach: same\n"));
 
                 /* The property has changed but the value is the same,
@@ -1141 +1143 @@
     }
 
-    LALOG(("LA: laProcessAttach: action %d\n",
+    LogFlowFunc(("laProcessAttach: action %d\n",
            pCtx->u32Action));
 }
@@ -1152 +1154 @@
      * That is two or more LA_DO_ATTACH will do just one LA_DO_ATTACH.
      */
-    LALOG(("LA: laDoActions: action %d, prev %d\n",
+    LogFlowFunc(("laDoActions: action %d, prev %d\n",
            pCtx->u32Action, pCtx->u32PrevAction));
 
@@ -1204 +1206 @@
     pCtx->u32Action = LA_DO_NOTHING;
 
-    LALOG(("LA: laDoActions: leave\n"));
+    LogFlowFunc(("laDoActions: leave\n"));
 }
 
@@ -1222 +1224 @@
     }
 
-    LALOG(("VBoxTray: VBoxLAInit\n"));
+    LogFlowFunc(("\n"));
 
     /* DetachOnDisconnect is enabled by default. */
@@ -1236 +1238 @@
     }
 
-    LALOGFORCE(("VBoxTray: VBoxLAInit: dod %d, VBoxTrayLA %x\n", gCtx.fDetachOnDisconnect, dwValue));
+    LogRel(("LA: DetachOnDisconnect=%RTbool\n", gCtx.fDetachOnDisconnect));
 
     int rc = VbglR3GuestPropConnect(&gCtx.u32GuestPropHandle);
@@ -1258 +1260 @@
 void VBoxLADestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    LALOG(("VBoxTray: VBoxLADestroy\n"));
+    LogFlowFuncEnter();
 
     VBOXLACONTEXT *pCtx = (VBOXLACONTEXT *)pInstance;
@@ -1280 +1282 @@
     VBOXLACONTEXT *pCtx = (VBOXLACONTEXT *)pInstance;
 
-    LALOG(("VBoxTray: VBoxLAThread: Started.\n"));
+    LogFlowFunc(("Started\n"));
 
     /*
@@ -1295 +1297 @@
     if (!ActionExecutorEnumerateRegistryKey(g_pwszRegKeyReconnectActions, &gCtx.listAttachActions))
     {
-        LALOG(("LA: Can't enumerate registry key %ls\n", g_pwszRegKeyReconnectActions));
+        LogFlowFunc(("Can't enumerate registry key %ls\n", g_pwszRegKeyReconnectActions));
     }
     if (!ActionExecutorEnumerateRegistryKey(g_pwszRegKeyDisconnectActions, &gCtx.listDetachActions))
     {
-        LALOG(("LA: Can't enumerate registry key %ls\n", g_pwszRegKeyDisconnectActions));
+        LogFlowFunc(("Can't enumerate registry key %ls\n", g_pwszRegKeyDisconnectActions));
     }
 
@@ -1355 +1357 @@
                         && fClientIdChanged)
                     {
-                        LALOG(("LA: client disconnected\n"));
+                        LogFlowFunc(("client disconnected\n"));
 
                         /* laDoActions will prevent a repeated detach action. So if there
@@ -1395 +1397 @@
     }
 
-    LALOG(("VBoxTray: VBoxLAThread: Finished.\n"));
+    LogFlowFunc(("Finished\n"));
     return 0;
 }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 #include "VBoxMMR.h"
 #include <iprt/ldr.h>
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
+
 
 struct VBOXMMRCONTEXT
@@ -48 +56 @@
 int VBoxMMRInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    LogRel2(("VBoxMMR: Initializing\n"));
+    LogFlowFuncEnter();
 
     int rc = RTLdrLoadAppPriv(g_pszMMRDLL, &gCtx.hModHook);
@@ -66 +74 @@
 
             rc = RTErrConvertFromWin32(GetLastError());
-            LogRel2(("VBoxMMR: Error installing hooking proc: %Rrc\n", rc));
+            LogFlowFunc(("Error installing hooking proc: %Rrc\n", rc));
         }
         else
         {
-            LogRel2(("VBoxMMR: Hooking proc not found\n"));
+            LogFlowFunc(("Hooking proc not found\n"));
             rc = VERR_NOT_FOUND;
         }
@@ -78 +86 @@
     }
     else
-        LogRel2(("VBoxMMR: Hooking library not found (%Rrc)\n", rc));
+        LogFlowFunc(("Hooking library not found (%Rrc)\n", rc));
 
     return rc;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
 #define _WIN32_WINNT 0x0500
 #include <Windows.h>
+
+#include <iprt/assert.h>
+#include <iprt/ldr.h>
+
+#include <VBoxDisplay.h>
+#include <VBoxGuestInternal.h>
+#include <VBoxHook.h>
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+#include <VBox/VMMDev.h>
+
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 #include "VBoxSeamless.h"
-#include <VBoxHook.h>
-#include <VBoxDisplay.h>
-#include <VBox/VMMDev.h>
-#include <iprt/assert.h>
-#include <iprt/ldr.h>
-#include <VBoxGuestInternal.h>
+
+
 
 typedef struct _VBOXSEAMLESSCONTEXT

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <VBox/VBoxGuestLib.h>
 
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
+
+
 int VBoxSharedFoldersAutoMount(void)
 {
@@ -40 +48 @@
             if (VbglR3SharedFolderExists(u32ClientId, "vbsfAutoMount"))
             {
-                Log(("VBoxTray: Hosts supports auto-mount root\n"));
+                LogFlowFunc(("Hosts supports auto-mount root\n"));
             }
             else
             {
 #endif
-                Log(("VBoxTray: Got %u shared folder mappings\n", cMappings));
+                LogFlowFunc(("Got %u shared folder mappings\n", cMappings));
                 for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)
                 {
@@ -53 +61 @@
                         && *pszName)
                     {
-                        Log(("VBoxTray: Connecting share %u (%s) ...\n", i+1, pszName));
+                        LogFlowFunc(("Connecting share %u (%s) ...\n", i+1, pszName));
 
                         char *pszShareName;
@@ -77 +85 @@
                                 if (dwErr == NO_ERROR)
                                 {
-                                    LogRel(("VBoxTray: Shared folder \"%s\" was mounted to drive \"%s\"\n", pszName, szCurDrive));
+                                    LogRel(("Shared folder \"%s\" was mounted to drive \"%s\"\n", pszName, szCurDrive));
                                     break;
                                 }
                                 else
                                 {
-                                    LogRel(("VBoxTray: Mounting \"%s\" to \"%s\" resulted in dwErr = %ld\n", pszName, szCurDrive, dwErr));
+                                    LogRel(("Mounting \"%s\" to \"%s\" resulted in dwErr = %ld\n", pszName, szCurDrive, dwErr));
 
                                     switch (dwErr)
@@ -94 +102 @@
 
                                         default:
-                                            LogRel(("VBoxTray: Error while mounting shared folder \"%s\" to \"%s\", error = %ld\n",
+                                            LogRel(("Error while mounting shared folder \"%s\" to \"%s\", error = %ld\n",
                                                     pszName, szCurDrive, dwErr));
                                             break;
@@ -103 +111 @@
                             if (chDrive > 'Z')
                             {
-                                LogRel(("VBoxTray: No free driver letter found to assign shared folder \"%s\", aborting\n", pszName));
+                                LogRel(("No free driver letter found to assign shared folder \"%s\", aborting\n", pszName));
                                 break;
                             }
@@ -114 +122 @@
                     }
                     else
-                        Log(("VBoxTray: Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
+                        LogFlowFunc(("Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
                              paMappings[i].u32Root, rc));
                 }
@@ -123 +131 @@
         }
         else
-            Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
+            LogFlowFunc(("Error while getting the shared folder mappings, rc = %Rrc\n", rc));
         VbglR3SharedFolderDisconnect(u32ClientId);
     }
     else
     {
-        Log(("VBoxTray: Failed to connect to the shared folder service, error %Rrc\n", rc));
+        LogFlowFunc(("Failed to connect to the shared folder service, error %Rrc\n", rc));
         /* return success, otherwise VBoxTray will not start! */
         rc = VINF_SUCCESS;
@@ -140 +148 @@
     int rc = VbglR3SharedFolderConnect(&u32ClientId);
     if (!RT_SUCCESS(rc))
-        Log(("VBoxTray: Failed to connect to the shared folder service, error %Rrc\n", rc));
+        LogFlowFunc(("Failed to connect to the shared folder service, error %Rrc\n", rc));
     else
     {
@@ -157 +165 @@
                     && *pszName)
                 {
-                    Log(("VBoxTray: Disconnecting share %u (%s) ...\n", i+1, pszName));
+                    LogFlowFunc(("Disconnecting share %u (%s) ...\n", i+1, pszName));
 
                     char *pszShareName;
@@ -165 +173 @@
                         if (dwErr == NO_ERROR)
                         {
-                            LogRel(("VBoxTray: Share \"%s\" was disconnected\n", pszShareName));
+                            LogRel(("Share \"%s\" was disconnected\n", pszShareName));
                             RTStrFree(pszShareName);
                             RTStrFree(pszName);
@@ -171 +179 @@
                         }
 
-                        LogRel(("VBoxTray: Disconnecting \"%s\" failed, dwErr = %ld\n", pszShareName, dwErr));
+                        LogRel(("Disconnecting \"%s\" failed, dwErr = %ld\n", pszShareName, dwErr));
 
                         switch (dwErr)
@@ -179 +187 @@
 
                             default:
-                                LogRel(("VBoxTray: Error while disconnecting shared folder \"%s\", error = %ld\n",
+                                LogRel(("Error while disconnecting shared folder \"%s\", error = %ld\n",
                                         pszShareName, dwErr));
                                 break;
@@ -191 +199 @@
                 }
                 else
-                    Log(("VBoxTray: Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
+                    LogFlowFunc(("Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
                          paMappings[i].u32Root, rc));
             }
@@ -197 +205 @@
         }
         else
-            Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
+            LogFlowFunc(("Error while getting the shared folder mappings, rc = %Rrc\n", rc));
         VbglR3SharedFolderDisconnect(u32ClientId);
     }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-
 #include <package-generated.h>
 #include "product-generated.h"
@@ -56 +51 @@
 #include <iprt/system.h>
 #include <iprt/time.h>
+
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
 #include <VBox/log.h>
 
@@ -257 +257 @@
     {
         DWORD dwErr = GetLastError();
-        Log(("VBoxTray: Could not load tray icon, error %08X\n", dwErr));
+        Log(("Could not load tray icon, error %08X\n", dwErr));
         return RTErrConvertFromWin32(dwErr);
     }
@@ -277 +277 @@
     {
         DWORD dwErr = GetLastError();
-        Log(("VBoxTray: Could not create tray icon, error = %08X\n", dwErr));
+        Log(("Could not create tray icon, error = %08X\n", dwErr));
         rc = RTErrConvertFromWin32(dwErr);
         RT_ZERO(gNotifyIconData);
@@ -309 +309 @@
     AssertPtrReturn(pTable, VERR_INVALID_POINTER);
 
-    Log(("VBoxTray: Starting services ...\n"));
+    Log(("Starting services ...\n"));
 
     /** @todo Use IPRT events here. */
@@ -324 +324 @@
            && pTable->pszName)
     {
-        Log(("VBoxTray: Starting %s ...\n", pTable->pszName));
+        Log(("Starting %s ...\n", pTable->pszName));
 
         int rc = VINF_SUCCESS;
@@ -339 +339 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("VBoxTray: Failed to initialize service \"%s\", rc=%Rrc\n",
+            LogRel(("Failed to initialize service \"%s\", rc=%Rrc\n",
                     pTable->pszName, rc));
         }
@@ -363 +363 @@
             else
             {
-                Log(("VBoxTray: Failed to start the thread\n"));
+                Log(("Failed to start the thread\n"));
                 if (pTable->pfnDestroy)
                     pTable->pfnDestroy(pEnv, pTable->pInstance);
@@ -438 +438 @@
         {
             DWORD dwErr = GetLastError();
-            Log(("VBoxTray: Registering global message \"%s\" failed, error = %08X\n", dwErr));
+            Log(("Registering global message \"%s\" failed, error = %08X\n", dwErr));
             rc = RTErrConvertFromWin32(dwErr);
         }
@@ -482 +482 @@
     {
         dwErr = GetLastError();
-        LogRel(("VBoxTray: Could not open VirtualBox Guest Additions driver! Please install / start it first! Error = %08X\n", dwErr));
+        LogRel(("Could not open VirtualBox Guest Additions driver! Please install / start it first! Error = %08X\n", dwErr));
     }
     return RTErrConvertFromWin32(dwErr);
@@ -623 +623 @@
     if (ghwndToolWindow)
     {
-        Log(("VBoxTray: Destroying tool window ...\n"));
+        Log(("Destroying tool window ...\n"));
 
         /* Destroy the tool window. */
@@ -647 +647 @@
     {
         dwErr = GetLastError();
-        Log(("VBoxTray: Registering invisible tool window failed, error = %08X\n", dwErr));
+        Log(("Registering invisible tool window failed, error = %08X\n", dwErr));
     }
     else
@@ -665 +665 @@
         {
             dwErr = GetLastError();
-            Log(("VBoxTray: Creating invisible tool window failed, error = %08X\n", dwErr));
+            Log(("Creating invisible tool window failed, error = %08X\n", dwErr));
         }
         else
@@ -672 +672 @@
             hlpReloadCursor();
 
-            Log(("VBoxTray: Invisible tool window handle = %p\n", ghwndToolWindow));
+            Log(("Invisible tool window handle = %p\n", ghwndToolWindow));
         }
     }
@@ -688 +688 @@
     if (GetVersionEx(&info))
     {
-        Log(("VBoxTray: Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
+        Log(("Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
         gMajorVersion = info.dwMajorVersion;
     }
@@ -706 +706 @@
     {
         dwErr = GetLastError();
-        Log(("VBoxTray: SetSecurityDescriptorDacl failed with last error = %08X\n", dwErr));
+        Log(("SetSecurityDescriptorDacl failed with last error = %08X\n", dwErr));
     }
     else
@@ -716 +716 @@
             *(void **)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA =
                 RTLdrGetSystemSymbol("advapi32.dll", "ConvertStringSecurityDescriptorToSecurityDescriptorA");
-            Log(("VBoxTray: pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
+            Log(("pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
             if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA)
             {
@@ -729 +729 @@
                 {
                     dwErr = GetLastError();
-                    Log(("VBoxTray: ConvertStringSecurityDescriptorToSecurityDescriptorA failed with last error = %08X\n", dwErr));
+                    Log(("ConvertStringSecurityDescriptorToSecurityDescriptorA failed with last error = %08X\n", dwErr));
                 }
                 else
@@ -737 +737 @@
                     {
                         dwErr = GetLastError();
-                        Log(("VBoxTray: GetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
+                        Log(("GetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
                     }
                     else
@@ -745 +745 @@
                         {
                             dwErr = GetLastError();
-                            Log(("VBoxTray: SetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
+                            Log(("SetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
                         }
                     }
@@ -759 +759 @@
             {
                 dwErr = GetLastError();
-                Log(("VBoxTray: CreateEvent for Seamless failed, last error = %08X\n", dwErr));
+                Log(("CreateEvent for Seamless failed, last error = %08X\n", dwErr));
             }
 
@@ -766 +766 @@
             {
                 dwErr = GetLastError();
-                Log(("VBoxTray: CreateEvent for Seamless failed, last error = %08X\n", dwErr));
+                Log(("CreateEvent for Seamless failed, last error = %08X\n", dwErr));
             }
         }
@@ -801 +801 @@
 {
     int rc = VINF_SUCCESS;
-    Log(("VBoxTray: Entering vboxTrayServiceMain\n"));
+    Log(("Entering vboxTrayServiceMain\n"));
 
     ghStopSem = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -807 +807 @@
     {
         rc = RTErrConvertFromWin32(GetLastError());
-        Log(("VBoxTray: CreateEvent for stopping VBoxTray failed, rc=%Rrc\n", rc));
+        Log(("CreateEvent for stopping VBoxTray failed, rc=%Rrc\n", rc));
     }
     else
@@ -891 +891 @@
                 }
 
-                Log(("VBoxTray: Number of events to wait in main loop: %ld\n", dwEventCount));
+                Log(("Number of events to wait in main loop: %ld\n", dwEventCount));
                 while (true)
                 {
@@ -898 +898 @@
 
                     /* Only enable for message debugging, lots of traffic! */
-                    //Log(("VBoxTray: Wait result  = %ld\n", waitResult));
+                    //Log(("Wait result  = %ld\n", waitResult));
 
                     if (waitResult == 0)
                     {
-                        Log(("VBoxTray: Event 'Exit' triggered\n"));
+                        Log(("Event 'Exit' triggered\n"));
                         /* exit */
                         break;
@@ -915 +915 @@
                                 if (hWaitEvent[waitResult] == ghSeamlessWtNotifyEvent)
                                 {
-                                    Log(("VBoxTray: Event 'Seamless' triggered\n"));
+                                    Log(("Event 'Seamless' triggered\n"));
 
                                     /* seamless window notification */
@@ -923 +923 @@
                                 else if (hWaitEvent[waitResult] == ghSeamlessKmNotifyEvent)
                                 {
-                                    Log(("VBoxTray: Event 'Km Seamless' triggered\n"));
+                                    Log(("Event 'Km Seamless' triggered\n"));
 
                                     /* seamless window notification */
@@ -931 +931 @@
                                 else if (hWaitEvent[waitResult] == vboxDtGetNotifyEvent())
                                 {
-                                    Log(("VBoxTray: Event 'Dt' triggered\n"));
+                                    Log(("Event 'Dt' triggered\n"));
                                     VBoxTrayCheckDt();
                                     fHandled = TRUE;
@@ -945 +945 @@
                             {
 #ifndef DEBUG_andy
-                                Log(("VBoxTray: msg %p\n", msg.message));
+                                Log(("msg %p\n", msg.message));
 #endif
                                 if (msg.message == WM_QUIT)
                                 {
-                                    Log(("VBoxTray: WM_QUIT!\n"));
+                                    Log(("WM_QUIT!\n"));
                                     SetEvent(ghStopSem);
                                 }
@@ -958 +958 @@
                     }
                 }
-                Log(("VBoxTray: Returned from main loop, exiting ...\n"));
-            }
-            Log(("VBoxTray: Waiting for services to stop ...\n"));
+                Log(("Returned from main loop, exiting ...\n"));
+            }
+            Log(("Waiting for services to stop ...\n"));
             vboxTrayStopServices(&svcEnv, vboxServiceTable);
         } /* Services started */
@@ -968 +968 @@
     vboxTrayRemoveTrayIcon();
 
-    Log(("VBoxTray: Leaving vboxTrayServiceMain with rc=%Rrc\n", rc));
+    Log(("Leaving vboxTrayServiceMain with rc=%Rrc\n", rc));
     return rc;
 }
@@ -989 +989 @@
     }
 
-    LogRel(("VBoxTray: %s r%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr()));
+    LogRel(("%s r%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr()));
 
     int rc = RTR3InitExeNoArguments(0);
@@ -1016 +1016 @@
             if (!RT_SUCCESS(rc))
             {
-                WARN(("VBoxTray: vboxStInit failed, rc %d\n"));
+                LogFlowFunc(("vboxStInit failed, rc %d\n"));
                 /* ignore the St Init failure. this can happen for < XP win that do not support WTS API
                  * in that case the session is treated as active connected to the physical console
@@ -1026 +1026 @@
             if (!RT_SUCCESS(rc))
             {
-                WARN(("VBoxTray: vboxDtInit failed, rc %d\n"));
+                LogFlowFunc(("vboxDtInit failed, rc %d\n"));
                 /* ignore the Dt Init failure. this can happen for < XP win that do not support WTS API
                  * in that case the session is treated as active connected to the physical console
@@ -1036 +1036 @@
             if (!RT_SUCCESS(rc))
             {
-                WARN(("VBoxAcquireGuestCaps cfg failed rc %d, ignoring..\n", rc));
+                LogFlowFunc(("VBoxAcquireGuestCaps cfg failed rc %d, ignoring..\n", rc));
             }
 
@@ -1042 +1042 @@
             if (RT_SUCCESS(rc))
             {
-                Log(("VBoxTray: Init successful\n"));
+                Log(("Init successful\n"));
                 rc = vboxTrayServiceMain();
                 if (RT_SUCCESS(rc))
@@ -1065 +1065 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("VBoxTray: Error while starting, rc=%Rrc\n", rc));
+        LogRel(("Error while starting, rc=%Rrc\n", rc));
         hlpReportStatus(VBoxGuestFacilityStatus_Failed);
     }
-    LogRel(("VBoxTray: Ended\n"));
+    LogRel(("Ended\n"));
     vboxTrayCloseBaseDriver();
 
@@ -1094 +1094 @@
         case WM_CREATE:
         {
-            Log(("VBoxTray: Tool window created\n"));
+            Log(("Tool window created\n"));
 
             int rc = vboxTrayRegisterGlobalMessages(&s_vboxGlobalMessageTable[0]);
             if (RT_FAILURE(rc))
-                Log(("VBoxTray: Error registering global window messages, rc=%Rrc\n", rc));
+                Log(("Error registering global window messages, rc=%Rrc\n", rc));
             return 0;
         }
@@ -1106 +1106 @@
 
         case WM_DESTROY:
-            Log(("VBoxTray: Tool window destroyed\n"));
+            Log(("Tool window destroyed\n"));
             KillTimer(ghwndToolWindow, TIMERID_VBOXTRAY_CHECK_HOSTVERSION);
             return 0;
@@ -1226 +1226 @@
 
         DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
+        LogFlowFunc(("WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -1232 +1232 @@
     {
         DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
+        LogFlowFunc(("WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -1260 +1260 @@
                                     (void **)&gVBoxSt.pfnWTSQuerySessionInformationA);
                 if (RT_FAILURE(rc))
-                    WARN(("VBoxTray: WTSQuerySessionInformationA not found\n"));
+                    LogFlowFunc(("WTSQuerySessionInformationA not found\n"));
             }
             else
-                WARN(("VBoxTray: WTSUnRegisterSessionNotification not found\n"));
+                LogFlowFunc(("WTSUnRegisterSessionNotification not found\n"));
         }
         else
-            WARN(("VBoxTray: WTSRegisterSessionNotification not found\n"));
+            LogFlowFunc(("WTSRegisterSessionNotification not found\n"));
         if (RT_SUCCESS(rc))
         {
@@ -1275 +1275 @@
             {
                 DWORD dwErr = GetLastError();
-                WARN(("VBoxTray: WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+                LogFlowFunc(("WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
                 if (dwErr == RPC_S_INVALID_BINDING)
                 {
@@ -1295 +1295 @@
     }
     else
-        WARN(("VBoxTray: WTSAPI32 load failed, rc = %Rrc\n", rc));
+        LogFlowFunc(("WTSAPI32 load failed, rc = %Rrc\n", rc));
 
     RT_ZERO(gVBoxSt);
@@ -1307 +1307 @@
     if (!gVBoxSt.hWTSAPIWnd)
     {
-        WARN(("VBoxTray: vboxStTerm called for non-initialized St\n"));
+        LogFlowFunc(("vboxStTerm called for non-initialized St\n"));
         return;
     }
@@ -1322 +1322 @@
         {
             DWORD dwErr = GetLastError();
-            WARN(("VBoxTray: WTSAPI32 load failed, error = %08X\n", dwErr));
+            LogFlowFunc(("WTSAPI32 load failed, error = %08X\n", dwErr));
         }
     }
@@ -1346 +1346 @@
         VBOXST_DBG_MAKECASE(WTS_SESSION_REMOTE_CONTROL);
         default:
-            WARN(("VBoxTray: invalid WTS state %d\n", val));
+            LogFlowFunc(("invalid WTS state %d\n", val));
             return "Unknown";
     }
@@ -1365 +1365 @@
     {
         DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: timer WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+        LogFlowFunc(("timer WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
         Assert(gVBoxSt.fIsConsole == TRUE);
         Assert(gVBoxSt.enmConnectState == WTSActive);
@@ -1376 +1376 @@
 static BOOL vboxStHandleEvent(WPARAM wEvent, LPARAM SessionID)
 {
-    WARN(("VBoxTray: WTS Event: %s\n", vboxStDbgGetString(wEvent)));
+    LogFlowFunc(("WTS Event: %s\n", vboxStDbgGetString(wEvent)));
     BOOL fOldIsActiveConsole = vboxStIsActiveConsole();
 
@@ -1425 +1425 @@
 //        {
 //            DWORD dwErr = GetLastError();
-//            WARN(("VBoxTray: pfnGetThreadDesktop for Seamless failed, last error = %08X\n", dwErr));
+//            LogFlowFunc(("pfnGetThreadDesktop for Seamless failed, last error = %08X\n", dwErr));
 //        }
 
@@ -1433 +1433 @@
     {
         DWORD dwErr = GetLastError();
-//        WARN(("VBoxTray: pfnOpenInputDesktop for Seamless failed, last error = %08X\n", dwErr));
+//        LogFlowFunc(("pfnOpenInputDesktop for Seamless failed, last error = %08X\n", dwErr));
     }
     return fIsInputDt;
@@ -1456 +1456 @@
     if (GetVersionEx(&info))
     {
-        LogRel(("VBoxTray: Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
+        LogRel(("Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
         gMajorVersion = info.dwMajorVersion;
     }
@@ -1476 +1476 @@
                                     (void **)&gVBoxDt.pfnVBoxHookRemoveActiveDesktopTracker);
                 if (RT_FAILURE(rc))
-                    WARN(("VBoxTray: VBoxHookRemoveActiveDesktopTracker not found\n"));
+                    LogFlowFunc(("VBoxHookRemoveActiveDesktopTracker not found\n"));
             }
             else
-                WARN(("VBoxTray: VBoxHookInstallActiveDesktopTracker not found\n"));
+                LogFlowFunc(("VBoxHookInstallActiveDesktopTracker not found\n"));
             if (RT_SUCCESS(rc))
             {
@@ -1486 +1486 @@
                 if (!gVBoxDt.pfnGetThreadDesktop)
                 {
-                    WARN(("VBoxTray: GetThreadDesktop not found\n"));
+                    LogFlowFunc(("GetThreadDesktop not found\n"));
                     rc = VERR_NOT_SUPPORTED;
                 }
@@ -1493 +1493 @@
                 if (!gVBoxDt.pfnOpenInputDesktop)
                 {
-                    WARN(("VBoxTray: OpenInputDesktop not found\n"));
+                    LogFlowFunc(("OpenInputDesktop not found\n"));
                     rc = VERR_NOT_SUPPORTED;
                 }
@@ -1500 +1500 @@
                 if (!gVBoxDt.pfnCloseDesktop)
                 {
-                    WARN(("VBoxTray: CloseDesktop not found\n"));
+                    LogFlowFunc(("CloseDesktop not found\n"));
                     rc = VERR_NOT_SUPPORTED;
                 }
@@ -1516 +1516 @@
                         {
                             DWORD dwErr = GetLastError();
-                            WARN(("VBoxTray: pfnVBoxHookInstallActiveDesktopTracker failed, last error = %08X\n", dwErr));
+                            LogFlowFunc(("pfnVBoxHookInstallActiveDesktopTracker failed, last error = %08X\n", dwErr));
                         }
                     }
@@ -1526 +1526 @@
                         {
                             DWORD dwErr = GetLastError();
-                            WARN(("VBoxTray: SetTimer error %08X\n", dwErr));
+                            LogFlowFunc(("SetTimer error %08X\n", dwErr));
                             rc = RTErrConvertFromWin32(dwErr);
                         }
@@ -1544 +1544 @@
         {
             DWORD dwErr = GetLastError();
-            WARN(("VBoxTray: CreateEvent for Seamless failed, last error = %08X\n", dwErr));
+            LogFlowFunc(("CreateEvent for Seamless failed, last error = %08X\n", dwErr));
             rc = RTErrConvertFromWin32(dwErr);
         }
@@ -1553 +1553 @@
     {
         DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: CreateEvent for Seamless failed, last error = %08X\n", dwErr));
+        LogFlowFunc(("CreateEvent for Seamless failed, last error = %08X\n", dwErr));
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -1603 +1603 @@
     DWORD cbReturned = 0;
     VBoxGuestCapsAquire Info;
-    Log(("VBoxTray: VBoxAcquireGuestCaps or(0x%x), not(0x%x), cfx(%d)\n", fOr, fNot, fCfg));
+    Log(("VBoxAcquireGuestCaps or(0x%x), not(0x%x), cfx(%d)\n", fOr, fNot, fCfg));
     Info.enmFlags = fCfg ? VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE : VBOXGUESTCAPSACQUIRE_FLAGS_NONE;
     Info.rc = VERR_NOT_IMPLEMENTED;
@@ -1611 +1611 @@
     {
         DWORD LastErr = GetLastError();
-        WARN(("VBoxTray: DeviceIoControl VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed LastErr %d\n", LastErr));
+        LogFlowFunc(("DeviceIoControl VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed LastErr %d\n", LastErr));
         return RTErrConvertFromWin32(LastErr);
     }
@@ -1618 +1618 @@
     if (!RT_SUCCESS(rc))
     {
-        WARN(("VBoxTray: VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed rc %d\n", rc));
+        LogFlowFunc(("VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed rc %d\n", rc));
         return rc;
     }
@@ -1663 +1663 @@
     if (fEnabled)
     {
-        Log(("VBoxTray: vboxCapsOnEnableSeamles: ENABLED\n"));
+        Log(("vboxCapsOnEnableSeamles: ENABLED\n"));
         Assert(pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_ACQUIRED);
         Assert(pCap->enmFuncState == VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
@@ -1670 +1670 @@
     else
     {
-        Log(("VBoxTray: vboxCapsOnEnableSeamles: DISABLED\n"));
+        Log(("vboxCapsOnEnableSeamles: DISABLED\n"));
         Assert(pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_ACQUIRED || pCap->enmFuncState != VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
         VBoxSeamlessDisable();
@@ -1680 +1680 @@
     VBOXCAPS *pConsole = &gVBoxCaps;
 
-    Log(("VBoxTray: vboxCapsEntryAcStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+    Log(("vboxCapsEntryAcStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
             enmAcState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
 
@@ -1708 +1708 @@
     VBOXCAPS *pConsole = &gVBoxCaps;
 
-    Log(("VBoxTray: vboxCapsEntryFuncStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+    Log(("vboxCapsEntryFuncStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
             enmFuncState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
 
@@ -1756 +1756 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
-    Log(("VBoxTray: VBoxCapsReleaseAll\n"));
+    Log(("VBoxCapsReleaseAll\n"));
     int rc = VBoxAcquireGuestCaps(0, VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, false);
     if (!RT_SUCCESS(rc))
     {
-        WARN(("VBoxTray: vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
+        LogFlowFunc(("vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
         return rc;
     }
@@ -1766 +1766 @@
     if (pConsole->idTimer)
     {
-        Log(("VBoxTray: killing console timer\n"));
+        Log(("killing console timer\n"));
         KillTimer(ghwndToolWindow, pConsole->idTimer);
         pConsole->idTimer = 0;
@@ -1843 +1843 @@
     if (pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_RELEASED)
     {
-        WARN(("VBoxTray: invalid cap[%d] state[%d] on release\n", iCap, pCap->enmAcState));
+        LogFlowFunc(("invalid cap[%d] state[%d] on release\n", iCap, pCap->enmAcState));
         return VERR_INVALID_STATE;
     }
@@ -1863 +1863 @@
     Assert(VBoxConsoleIsAllowed());
     VBOXCAPS_ENTRY *pCap = &pConsole->aCaps[iCap];
-    Log(("VBoxTray: VBoxCapsEntryAcquire %d\n", iCap));
+    Log(("VBoxCapsEntryAcquire %d\n", iCap));
     if (pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_RELEASED)
     {
-        WARN(("VBoxTray: invalid cap[%d] state[%d] on acquire\n", iCap, pCap->enmAcState));
+        LogFlowFunc(("invalid cap[%d] state[%d] on acquire\n", iCap, pCap->enmAcState));
         return VERR_INVALID_STATE;
     }
@@ -1880 +1880 @@
     if (rc != VERR_RESOURCE_BUSY)
     {
-        WARN(("VBoxTray: vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
+        LogFlowFunc(("vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
         return rc;
     }
 
-    WARN(("VBoxTray: iCap %d is busy!\n", iCap));
+    LogFlowFunc(("iCap %d is busy!\n", iCap));
 
     /* the cap was busy, most likely it is still used by other VBoxTray instance running in another session,
@@ -1894 +1894 @@
         {
             DWORD dwErr = GetLastError();
-            WARN(("VBoxTray: SetTimer error %08X\n", dwErr));
+            LogFlowFunc(("SetTimer error %08X\n", dwErr));
             return RTErrConvertFromWin32(dwErr);
         }
@@ -1905 +1905 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
-    Log(("VBoxTray: VBoxCapsAcquireAllSupported\n"));
+    Log(("VBoxCapsAcquireAllSupported\n"));
     for (int i = 0; i < RT_ELEMENTS(pConsole->aCaps); ++i)
     {
         if (pConsole->aCaps[i].enmFuncState >= VBOXCAPS_ENTRY_FUNCSTATE_SUPPORTED)
         {
-            Log(("VBoxTray: VBoxCapsAcquireAllSupported acquiring cap %d, state %d\n", i, pConsole->aCaps[i].enmFuncState));
+            Log(("VBoxCapsAcquireAllSupported acquiring cap %d, state %d\n", i, pConsole->aCaps[i].enmFuncState));
             VBoxCapsEntryAcquire(i);
         }
         else
         {
-            WARN(("VBoxTray: VBoxCapsAcquireAllSupported: WARN: cap %d not supported, state %d\n", i, pConsole->aCaps[i].enmFuncState));
+            LogFlowFunc(("VBoxCapsAcquireAllSupported: WARN: cap %d not supported, state %d\n", i, pConsole->aCaps[i].enmFuncState));
         }
     }

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
 
 #include <VBox/version.h>
-#include <VBox/Log.h>
 #include <VBox/VBoxGuest.h> /** @todo use the VbglR3 interface! */
 #include <VBox/VBoxGuestLib.h>
@@ -54 +53 @@
 
 #include "VBoxDispIf.h"
-
-#ifdef DEBUG_misha
-#define WARN(_m) do { \
-            Assert(0); \
-            Log(_m); \
-        } while (0)
-#else
-#define WARN(_m) do { \
-            Log(_m); \
-        } while (0)
-#endif
 
 /*

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include "VBoxHelpers.h"
 #include "VBoxVRDP.h"
+
 #include <VBox/VMMDev.h>
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+#include <VBox/log.h>
+
 #include <VBoxGuestInternal.h>
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
+
 
 
@@ -94 +102 @@
              * The parameter has to be disabled.
              */
-            Log(("VBoxTray: vboxExperienceSet: Saving %s\n", parameters[i].name));
+            LogFlowFunc(("Saving %s\n", parameters[i].name));
 
             /* Save the current value. */
@@ -128 +136 @@
                     if (parameters[i].cbSavedValue > sizeof (parameters[i].achSavedValue))
                     {
-                        Log(("VBoxTray: vboxExperienceSet: Not enough space %d > %d\n", parameters[i].cbSavedValue, sizeof (parameters[i].achSavedValue)));
+                        LogFlowFunc(("Not enough space %d > %d\n", parameters[i].cbSavedValue, sizeof (parameters[i].achSavedValue)));
                         break;
                     }
@@ -144 +152 @@
             }
 
-            Log(("VBoxTray: vboxExperienceSet: Disabling %s\n", parameters[i].name));
+            LogFlowFunc(("Disabling %s\n", parameters[i].name));
 
             /* Disable the feature. */
@@ -199 +207 @@
         if (parameters[i].level > level)
         {
-            Log(("VBoxTray: vboxExperienceRestore: Restoring %s\n", parameters[i].name));
+            LogFlowFunc(("Restoring %s\n", parameters[i].name));
 
             /* Restore the feature. */
@@ -269 +277 @@
 int VBoxVRDPInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log(("VBoxTray: VBoxVRDPInit\n"));
+    LogFlowFunc(("VBoxVRDPInit\n"));
 
     gCtx.pEnv      = pEnv;
@@ -296 +304 @@
 void VBoxVRDPDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
-    Log(("VBoxTray: VBoxVRDPDestroy\n"));
+    LogFlowFunc(("VBoxVRDPDestroy\n"));
     VBOXVRDPCONTEXT *pCtx = (VBOXVRDPCONTEXT *)pInstance;
     vboxExperienceRestore (pCtx->level);
@@ -322 +330 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask - or) succeeded\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask - or) succeeded\n"));
     }
     else
     {
-        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask) failed\n"));
         return 0;
     }
@@ -338 +346 @@
         if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
-            Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl succeeded\n"));
+            LogFlowFunc(("DeviceIOControl succeeded\n"));
 
             /* are we supposed to stop? */
@@ -344 +352 @@
                 break;
 
-            Log(("VBoxTray: VBoxVRDPThread: checking event\n"));
+            LogFlowFunc(("checking event\n"));
 
             /* did we get the right event? */
@@ -366 +374 @@
                                      &cbReturned, NULL))
                 {
-                    Log(("VBoxTray: VBoxVRDPThread: u8VRDPActive = %d, level %d\n", vrdpChangeRequest.u8VRDPActive, vrdpChangeRequest.u32VRDPExperienceLevel));
+                    LogFlowFunc(("u8VRDPActive = %d, level %d\n", vrdpChangeRequest.u8VRDPActive, vrdpChangeRequest.u32VRDPExperienceLevel));
 
                     if (vrdpChangeRequest.u8VRDPActive)
@@ -379 +387 @@
                             pCtx->fSavedThemeEnabled = pCtx->pfnIsThemeActive ();
 
-                            Log(("VBoxTray: VBoxVRDPThread: pCtx->fSavedThemeEnabled = %d\n", pCtx->fSavedThemeEnabled));
+                            LogFlowFunc(("pCtx->fSavedThemeEnabled = %d\n", pCtx->fSavedThemeEnabled));
 
                             if (pCtx->fSavedThemeEnabled)
@@ -397 +405 @@
                                 /* @todo the call returns S_OK but theming remains disabled. */
                                 HRESULT hrc = pCtx->pfnEnableTheming (TRUE);
-                                Log(("VBoxTray: VBoxVRDPThread: enabling theme rc = 0x%08X\n", hrc));
+                                LogFlowFunc(("enabling theme rc = 0x%08X\n", hrc));
                                 pCtx->fSavedThemeEnabled = FALSE;
                             }
@@ -410 +418 @@
                 {
 #ifndef DEBUG_andy /* Too noisy for me. */
-                    Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
+                    LogFlowFunc(("Error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
 #endif
                     /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -424 +432 @@
         {
 #ifndef DEBUG_andy
-            Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
+            LogFlowFunc(("Error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
 #endif
             /* sleep a bit to not eat too much CPU in case the above call always fails */
@@ -439 +447 @@
     if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {
-        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask - not) succeeded\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask - not) succeeded\n"));
     }
     else
     {
-        Log(("VBoxTray: VBoxVRDPThread: DeviceIOControl(CtlMask) failed\n"));
-    }
-
-    Log(("VBoxTray: VBoxVRDPThread: Finished VRDP change request thread\n"));
+        LogFlowFunc(("DeviceIOControl(CtlMask) failed\n"));
+    }
+
+    LogFlowFunc(("Finished VRDP change request thread\n"));
     return 0;
 }