Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

3 files changed, 29 insertions, 17 deletions

diff --git a/src/VBox/Additions/WINNT/include/VBoxDisplay.h b/src/VBox/Additions/WINNT/include/VBoxDisplay.h
index 195408f2..d043927f 100644
--- a/src/VBox/Additions/WINNT/include/VBoxDisplay.h
+++ b/src/VBox/Additions/WINNT/include/VBoxDisplay.h
@@ -2,7 +2,7 @@
  *
  * VBoxDisplay - private windows additions display header
  *
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -36,6 +36,9 @@
 # define VBOXESC_CRHGSMICTLCON_GETCLIENTID  0xABCD900F
 # define VBOXESC_REINITVIDEOMODESBYMASK     0xABCD9010
 # define VBOXESC_ADJUSTVIDEOMODES           0xABCD9011
+# define VBOXESC_SETCTXHOSTID               0xABCD9012
+# define VBOXESC_CONFIGURETARGETS           0xABCD9013
+# define VBOXESC_SETALLOCHOSTID             0xABCD9014
 #endif /* #ifdef VBOX_WITH_WDDM */
 
 # define VBOXESC_ISANYX                     0xABCD9200
@@ -77,6 +80,8 @@ typedef struct
     DWORD Width;
     DWORD Height;
     DWORD BitsPerPixel;
+    DWORD PosX;
+    DWORD PosY;
 } VBOXWDDM_RECOMMENDVIDPN_SCREEN_INFO, *PVBOXWDDM_RECOMMENDVIDPN_SCREEN_INFO;
 
 typedef struct
diff --git a/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h b/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h
index 1780417f..b98e7e43 100644
--- a/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h
+++ b/src/VBox/Additions/WINNT/include/VBoxGuestInternal.h
@@ -2,7 +2,7 @@
  *
  * VBoxGuestInternal -- Private windows additions declarations
  *
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/WINNT/include/VBoxHook.h b/src/VBox/Additions/WINNT/include/VBoxHook.h
index 975c5dfe..9e7ebcdf 100644
--- a/src/VBox/Additions/WINNT/include/VBoxHook.h
+++ b/src/VBox/Additions/WINNT/include/VBoxHook.h
@@ -1,8 +1,10 @@
+/* $Id: VBoxHook.h $ */
 /** @file
- *
- * VBoxHook -- Global windows hook dll
- *
- * Copyright (C) 2006-2007 Oracle Corporation
+ * VBoxHook -- Global windows hook dll.
+ */
+
+/*
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -12,22 +14,27 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifndef __VBoxHook_h__
-#define __VBoxHook_h__
+#ifndef ___winnt_include_VBoxHook_h
+#define ___winnt_include_VBoxHook_h
 
 /* custom messages as we must install the hook from the main thread */
-#define WM_VBOX_INSTALL_SEAMLESS_HOOK               0x2001
-#define WM_VBOX_REMOVE_SEAMLESS_HOOK                0x2002
+/** @todo r=andy Use WM_APP + n offsets here! */
+#define WM_VBOX_SEAMLESS_ENABLE                     0x2001
+#define WM_VBOX_SEAMLESS_DISABLE                    0x2002
 #define WM_VBOX_SEAMLESS_UPDATE                     0x2003
+#define WM_VBOX_GRAPHICS_SUPPORTED                  0x2004
+#define WM_VBOX_GRAPHICS_UNSUPPORTED                0x2005
+
 
+#define VBOXHOOK_DLL_NAME              "VBoxHook.dll"
+#define VBOXHOOK_GLOBAL_DT_EVENT_NAME  "Local\\VBoxHookDtNotifyEvent"
+#define VBOXHOOK_GLOBAL_WT_EVENT_NAME  "Local\\VBoxHookWtNotifyEvent"
 
-#define VBOXHOOK_DLL_NAME           "VBoxHook.dll"
-#define VBOXHOOK_GLOBAL_EVENT_NAME  "Local\\VBoxHookNotifyEvent"
+BOOL VBoxHookInstallActiveDesktopTracker(HMODULE hDll);
+BOOL VBoxHookRemoveActiveDesktopTracker();
 
-/* Install the global message hook */
-BOOL VBoxInstallHook(HMODULE hDll);
+BOOL VBoxHookInstallWindowTracker(HMODULE hDll);
+BOOL VBoxHookRemoveWindowTracker();
 
-/* Remove the global message hook */
-BOOL VBoxRemoveHook();
+#endif
 
-#endif /* __VBoxHook_h__ */