Changeset 50463 in vbox

Timestamp:

Feb 14, 2014 10:29:32 AM (11 years ago)

Author:

vboxsync

Message:

DnD: build fix and warnings

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/DragAndDrop/dndmanager.cpp (modified) (1 diff)
• src/VBox/HostServices/DragAndDrop/service.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -5370 +5370 @@
  VBOX_LIB_IPRT_GUEST_R0_NT4      = $(VBOX_LIB_IPRT_GUEST_R0)
 endif
-VBOX_LIB_VBGL_R3                 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB)
+VBOX_LIB_VBGL_R3                 = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib$(VBOX_SUFF_LIB) \
+                                   $(if $(VBOX_WITH_DRAG_AND_DROP),$(VBOX_PATH_ADDITIONS_LIB)/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB))
 VBOX_LIB_VBGL_R3_XFREE86         = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibXFree86$(VBOX_SUFF_LIB)
 VBOX_LIB_VBGL_R3_SHARED          = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3LibShared$(VBOX_SUFF_LIB)
@@ -5381 +5382 @@
  VBOX_LIB_VBGL_R3_SHARED_X86     = $(VBOX_LIB_VBGL_R3_SHARED)
 else
- VBOX_LIB_IPRT_GUEST_R3_X86      = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_LIB)
+ VBOX_LIB_IPRT_GUEST_R3_X86      = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3-x86$(VBOX_SUFF_LIB) \
+                                   $(if $(VBOX_WITH_DRAG_AND_DROP),$(VBOX_PATH_ADDITIONS_LIB)//VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB))
  VBOX_LIB_IPRT_GUEST_R3_SHARED_X86 = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3Shared-x86$(VBOX_SUFF_LIB)
  VBOX_LIB_VBGL_R3_X86            = $(VBOX_PATH_ADDITIONS_LIB)/VBoxGuestR3Lib-x86$(VBOX_SUFF_LIB)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -781 +781 @@
  VirtualBox_SOURCES += \
         src/runtime/UIDnDHandler.cpp
- VirtualBox_QT_MOCSRCS += \
-        src/runtime/UIDnDHandler.cpp
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_SOURCES += \

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.cpp

@@ -499 +499 @@
 
         unsigned uPercentage = (unsigned)((uint64_t)pSelf->m_cbTransfered * 100 / pSelf->m_cbTotal);
-        rc = pSelf->m_pfnProgressCallback(RT_CLAMP(uPercentage, 0, 100),
+        rc = pSelf->m_pfnProgressCallback(RT_MIN(uPercentage, 100),
                                           DragAndDropSvc::DND_PROGRESS_RUNNING,
                                           VINF_SUCCESS /* rc */, pSelf->m_pvProgressUser);

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -470 +470 @@
         DragAndDropSvc::VBOXDNDCBHGEVTPROGRESSDATA data;
         data.hdr.u32Magic = DragAndDropSvc::CB_MAGIC_DND_HG_EVT_PROGRESS;
-        data.uPercentage  = RT_CLAMP(uPercentage, 0, 100);
+        data.uPercentage  = RT_MIN(uPercentage, 100);
         data.uState       = uState;
         data.rc           = rc;