Changeset 49891 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 12, 2013 8:09:20 PM (11 years ago)

Author:

vboxsync

Message:

Merged private draganddrop branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk (modified) (4 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (10 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -26 +26 @@
 endif
 VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
-VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
+VBoxTray_DEFS     = \
+        VBOX_WITH_HGCM \
+        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
 VBoxTray_INCS     = ../include
 VBoxTray_SOURCES  = \
@@ -39 +41 @@
         VBoxHelpers.cpp \
         VBoxTray.rc
+ifdef VBOX_WITH_DRAG_AND_DROP
+ VBoxTray_DEFS     += \
+        VBOX_WITH_DRAG_AND_DROP \
+        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+ VBoxTray_SOURCES  += \
+        VBoxDnD.cpp \
+        VBoxDnDDataObject.cpp \
+        VBoxDnDEnumFormat.cpp \
+        VBoxDnDDropSource.cpp
+endif
 ifdef VBOX_WITH_GUEST_PROPS
- VBoxTray_DEFS     +=  _WIN32_IE=0x500 VBOX_WITH_GUEST_PROPS
+ VBoxTray_DEFS     += _WIN32_IE=0x500 VBOX_WITH_GUEST_PROPS
  VBoxTray_SOURCES  += \
         VBoxHostVersion.cpp \
@@ -46 +58 @@
 endif
 ifdef VBOX_WITH_SHARED_FOLDERS
- VBoxTray_DEFS     +=  VBOX_WITH_SHARED_FOLDERS
+ VBoxTray_DEFS     += VBOX_WITH_SHARED_FOLDERS
  VBoxTray_SOURCES  += \
         VBoxSharedFolders.cpp
@@ -57 +69 @@
         VBoxMMR.cpp
 endif
-
 ifdef VBOX_WITH_WDDM
  VBoxTray_DEFS   += VBOX_WITH_WDDM

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

@@ -525 +525 @@
     }
 
+#ifndef DEBUG_andy
     Log(("VBoxTray: vboxClipboardProcessMsg returned with rc = %ld\n", rc));
+#endif
     return rc;
 }

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

@@ -964 +964 @@
         else
         {
+#ifndef DEBUG_andy /* Too noisy for me. */
             Log(("VBoxTray: VBoxDisplayThread: 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 */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)

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

@@ -20 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#ifdef DEBUG
+# define LOG_ENABLED
+# define LOG_GROUP LOG_GROUP_DEFAULT
+#endif
+
+#include <package-generated.h>
+#include "product-generated.h"
+
 #include "VBoxTray.h"
 #include "VBoxTrayMsg.h"
@@ -30 +38 @@
 #include "VBoxHostVersion.h"
 #include "VBoxSharedFolders.h"
+#ifdef VBOX_WITH_DRAG_AND_DROP
+# include "VBoxDnD.h"
+#endif
 #include "VBoxIPC.h"
 #include "VBoxLA.h"
@@ -42 +53 @@
 #include <iprt/buildconfig.h>
 #include <iprt/ldr.h>
+#include <iprt/process.h>
+#include <iprt/system.h>
+#include <iprt/time.h>
+#include <VBox/log.h>
 
 /* Default desktop state tracking */
@@ -133 +148 @@
 DWORD                 gMajorVersion;
 
+static PRTLOGGER      g_pLoggerRelease = NULL;
+static uint32_t       g_cHistory = 10;                   /* Enable log rotation, 10 files. */
+static uint32_t       g_uHistoryFileTime = RT_SEC_1DAY;  /* Max 1 day per file. */
+static uint64_t       g_uHistoryFileSize = 100 * _1M;    /* Max 100MB per file. */
 
 /* The service table. */
@@ -195 +214 @@
         NULL /* pfnStop */,
         VBoxMMRDestroy
+    },
+#endif
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    {
+        "Drag and Drop",
+        VBoxDnDInit,
+        VBoxDnDThread,
+        VBoxDnDStop,
+        VBoxDnDDestroy
     },
 #endif
@@ -475 +503 @@
         ghVBoxDriver = NULL;
     }
+}
+
+/**
+ * Release logger callback.
+ *
+ * @return  IPRT status code.
+ * @param   pLoggerRelease
+ * @param   enmPhase
+ * @param   pfnLog
+ */
+static void vboxTrayLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
+{
+    /* Some introductory information. */
+    static RTTIMESPEC s_TimeSpec;
+    char szTmp[256];
+    if (enmPhase == RTLOGPHASE_BEGIN)
+        RTTimeNow(&s_TimeSpec);
+    RTTimeSpecToString(&s_TimeSpec, szTmp, sizeof(szTmp));
+
+    switch (enmPhase)
+    {
+        case RTLOGPHASE_BEGIN:
+        {
+            pfnLog(pLoggerRelease,
+                   "VBoxTray %s r%s %s (%s %s) release log\n"
+                   "Log opened %s\n",
+                   RTBldCfgVersion(), RTBldCfgRevisionStr(), VBOX_BUILD_TARGET,
+                   __DATE__, __TIME__, szTmp);
+
+            int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
+            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+                pfnLog(pLoggerRelease, "OS Product: %s\n", szTmp);
+            vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
+            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+                pfnLog(pLoggerRelease, "OS Release: %s\n", szTmp);
+            vrc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szTmp, sizeof(szTmp));
+            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+                pfnLog(pLoggerRelease, "OS Version: %s\n", szTmp);
+            if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
+                pfnLog(pLoggerRelease, "OS Service Pack: %s\n", szTmp);
+
+            /* the package type is interesting for Linux distributions */
+            char szExecName[RTPATH_MAX];
+            char *pszExecName = RTProcGetExecutablePath(szExecName, sizeof(szExecName));
+            pfnLog(pLoggerRelease,
+                   "Executable: %s\n"
+                   "Process ID: %u\n"
+                   "Package type: %s"
+#ifdef VBOX_OSE
+                   " (OSE)"
+#endif
+                   "\n",
+                   pszExecName ? pszExecName : "unknown",
+                   RTProcSelf(),
+                   VBOX_PACKAGE_STRING);
+            break;
+        }
+
+        case RTLOGPHASE_PREROTATE:
+            pfnLog(pLoggerRelease, "Log rotated - Log started %s\n", szTmp);
+            break;
+
+        case RTLOGPHASE_POSTROTATE:
+            pfnLog(pLoggerRelease, "Log continuation - Log started %s\n", szTmp);
+            break;
+
+        case RTLOGPHASE_END:
+            pfnLog(pLoggerRelease, "End of log file - Log started %s\n", szTmp);
+            break;
+
+        default:
+            /* nothing */;
+    }
+}
+
+/**
+ * Creates the default release logger outputting to the specified file.
+ * Pass NULL for disabled logging.
+ *
+ * @return  IPRT status code.
+ * @param   pszLogFile              Filename for log output.  Optional.
+ */
+static int vboxTrayLogCreate(const char *pszLogFile)
+{
+    /* Create release logger (stdout + file). */
+    static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
+    RTUINT fFlags = RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG;
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    fFlags |= RTLOGFLAGS_USECRLF;
+#endif
+    char szError[RTPATH_MAX + 128] = "";
+    int rc = RTLogCreateEx(&g_pLoggerRelease, fFlags,
+#ifdef DEBUG
+                           "all.e.l.f",
+                           "VBOXTRAY_LOG",
+#else
+                           "all",
+                           "VBOXTRAY_RELEASE_LOG",
+#endif
+                           RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT,
+                           vboxTrayLogHeaderFooter, g_cHistory, g_uHistoryFileSize, g_uHistoryFileTime,
+                           szError, sizeof(szError), pszLogFile);
+    if (RT_SUCCESS(rc))
+    {
+#ifdef DEBUG
+        RTLogSetDefaultInstance(g_pLoggerRelease);
+#else
+        /* Register this logger as the release logger. */
+        RTLogRelSetDefaultInstance(g_pLoggerRelease);
+#endif
+        /* Explicitly flush the log in case of VBOXTRAY_RELEASE_LOG=buffered. */
+        RTLogFlush(g_pLoggerRelease);
+    }
+    else
+        MessageBox(GetDesktopWindow(),
+                   szError, "VBoxTray - Logging Error", MB_OK | MB_ICONERROR);
+
+    return rc;
+}
+
+static void vboxTrayLogDestroy(void)
+{
+    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
 }
 
@@ -802 +953 @@
                             while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
                             {
+#ifndef DEBUG_andy
                                 Log(("VBoxTray: msg %p\n", msg.message));
+#endif
                                 if (msg.message == WM_QUIT)
                                 {
@@ -833 +986 @@
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-    /* Do not use a global namespace ("Global\\") for mutex name here, will blow up NT4 compatibility! */
+    /* Note: Do not use a global namespace ("Global\\") for mutex name here,
+     * will blow up NT4 compatibility! */
     HANDLE hMutexAppRunning = CreateMutex(NULL, FALSE, "VBoxTray");
     if (   hMutexAppRunning != NULL
         && GetLastError() == ERROR_ALREADY_EXISTS)
     {
-        /* Close the mutex for this application instance. */
+        /* VBoxTray already running? Bail out. */
         CloseHandle (hMutexAppRunning);
         hMutexAppRunning = NULL;
@@ -847 +1001 @@
 
     int rc = RTR3InitExeNoArguments(0);
+    if (RT_SUCCESS(rc))
+        rc = vboxTrayLogCreate(NULL /* pszLogFile */);
+
     if (RT_SUCCESS(rc))
     {
@@ -931 +1088 @@
 
     VbglR3Term();
+
+    vboxTrayLogDestroy();
+
     return RT_SUCCESS(rc) ? 0 : 1;
 }

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

@@ -409 +409 @@
                 else
                 {
+#ifndef DEBUG_andy /* Too noisy for me. */
                     Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n"));
-
+#endif
                     /* sleep a bit to not eat too much CPU in case the above call always fails */
                     if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)
@@ -422 +423 @@
         else
         {
+#ifndef DEBUG_andy
             Log(("VBoxTray: VBoxVRDPThread: Error from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n"));
-
+#endif
             /* sleep a bit to not eat too much CPU in case the above call always fails */
             if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0)