Changeset 50179 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

Timestamp:

Jan 23, 2014 12:14:27 PM (11 years ago)

Author:

vboxsync

Message:

Build fix.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (3 diffs)

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

@@ -191 +191 @@
     }
 
-    if (RT_SUCCESS(rc))
-    {
-        OleInitialize(NULL);
-
-        pThis->RegisterAsDropTarget();
-
+    HRESULT hr = OleInitialize(NULL);
+    if (SUCCEEDED(hr))
+    {
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+        rc = pThis->RegisterAsDropTarget();
+#endif
+    }
+    else
+    {
+        LogRelFunc(("Unable to initialize OLE, hr=%Rhrc\n", hr));
+        rc = VERR_COM_UNEXPECTED;
+    }
+
+    if (RT_SUCCESS(rc))
+    {
         bool fShutdown = false;
-
         do
         {
@@ -864 +872 @@
     {
         rc = makeFullscreen();
-        /*if (RT_SUCCESS(rc))
-            rc = RegisterAsDropTarget();*/
-
         if (RT_SUCCESS(rc))
         {
@@ -961 +966 @@
             uDefAction = DND_COPY_ACTION;
             uAllActions = uDefAction;
+
+            /** @todo There can be more than one format, separated
+             *        with \r\n. */
             strFormat = "text/plain;charset=utf-8";
         }