Changeset 80324 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Aug 16, 2019 9:40:21 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Also use the importchecker if VBOX_WITH_SHARED_CLIPBOARD_URI_LIST is set with VBoxTray now.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClipboard.cpp (modified) (2 diffs)

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

@@ -42 +42 @@
         VBoxHelpers.cpp \
         VBoxTray.rc
-ifndef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST # !!! HACK ALERT !!! Fix this by using dynamic imports!
- VBoxTray_USES.win = vboximportchecker
- VBoxTray_VBOX_IMPORT_CHECKER.win.x86 = nt4 #nt350
- VBoxTray_VBOX_IMPORT_CHECKER.win.amd64 = xp64
-endif
+VBoxTray_USES.win = vboximportchecker
+VBoxTray_VBOX_IMPORT_CHECKER.win.x86 = nt4 #nt350
+VBoxTray_VBOX_IMPORT_CHECKER.win.amd64 = xp64
 ifdef VBOX_WITH_SHARED_CLIPBOARD
  VBoxTray_DEFS     += \

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

@@ -35 +35 @@
 #include <VBox/GuestHost/SharedClipboard-win.h>
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-#   include <VBox/GuestHost/SharedClipboard-uri.h>
+# include <VBox/GuestHost/SharedClipboard-uri.h>
 #endif
 
@@ -41 +41 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-/** !!! HACK ALERT !!! Dynamically resolve functions! */
-#   ifdef _WIN32_IE
-#       undef _WIN32_IE
-#       define _WIN32_IE 0x0501
-#   endif
-#   include <iprt/win/shlobj.h>
-#   include <iprt/win/shlwapi.h>
+# include <iprt/win/shlobj.h>
+# include <iprt/win/shlwapi.h>
 #endif