Move guestCaps.h to its new location.

Another change towards the goal of isolating host/guest interfaces.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/appUtil/appUtil.c b/open-vm-tools/lib/appUtil/appUtil.c
index a6c149bb6807a561844c493951f34586c5a56e32..ea1f9efa05856d9e16a33c3e0b637ba498ab54bc 100644 (file)
--- a/open-vm-tools/lib/appUtil/appUtil.c
+++ b/open-vm-tools/lib/appUtil/appUtil.c
@@ -26,8 +26,8 @@
 #include <string.h>
 
 #include "vmware.h"
+#include "appUtil.h"
 #include "debug.h"
-#include "guestCaps.h"
 #include "rpcout.h"
 #include "str.h"
 

diff --git a/open-vm-tools/lib/ghIntegration/ghIntegration.c b/open-vm-tools/lib/ghIntegration/ghIntegration.c
index 008ec83fdbbd3ed7442dc85a82aca5cda984897f..c77273d96b7571206f908fd0baff50e21d3ba11c 100644 (file)
--- a/open-vm-tools/lib/ghIntegration/ghIntegration.c
+++ b/open-vm-tools/lib/ghIntegration/ghIntegration.c
@@ -28,7 +28,6 @@
 #include "dynxdr.h"
 #include "ghIntegration.h"
 #include "ghIntegrationInt.h"
-#include "guestCaps.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
 #include "guestrpc/ghiProtocolHandler.h"
 #include "guestrpc/ghiStartMenu.h"
@@ -40,6 +39,7 @@
 #include "unityCommon.h"
 #include "util.h"
 #include "xdrutil.h"
+#include "vmware/guestrpc/capabilities.h"
 
 
 /*

diff --git a/open-vm-tools/lib/ghIntegration/ghIntegrationX11.c b/open-vm-tools/lib/ghIntegration/ghIntegrationX11.c
index 1dc146bf9994425e0db883a7b8c30b6cd004e6c5..2167c9350230c9681ae671ab54c3617a734ed196 100644 (file)
--- a/open-vm-tools/lib/ghIntegration/ghIntegrationX11.c
+++ b/open-vm-tools/lib/ghIntegration/ghIntegrationX11.c
@@ -67,7 +67,6 @@
 #include "ghIntegration.h"
 #include "ghIntegrationInt.h"
 #include "guest_msg_def.h"
-#include "guestCaps.h"
 #include "Uri.h"
 #define URI_TEXTRANGE_EQUAL(textrange, str) \
    (((textrange).afterLast - (textrange).first) == strlen((str))        \

diff --git a/open-vm-tools/lib/include/appUtil.h b/open-vm-tools/lib/include/appUtil.h
index 12e7a4103849c506d737292bfc820f13e2b893fe..e44de59caa5a015d4af3dd6b400504b61c2dd5cb 100644 (file)
--- a/open-vm-tools/lib/include/appUtil.h
+++ b/open-vm-tools/lib/include/appUtil.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif // __cplusplus
 
 #include "vmware.h"
-#include "guestCaps.h"
+#include "vmware/guestrpc/capabilities.h"
 
 #ifdef __cplusplus
 };

diff --git a/open-vm-tools/lib/include/vmtoolsApp.h b/open-vm-tools/lib/include/vmtoolsApp.h
index ded1446f8bbc58d208d85687226825f1aad63ec9..3cab1f882bc8f2a2e946a2a7deba719d7e14d408 100644 (file)
--- a/open-vm-tools/lib/include/vmtoolsApp.h
+++ b/open-vm-tools/lib/include/vmtoolsApp.h
@@ -34,8 +34,8 @@
 #  include <windows.h>
 #  include <objbase.h>
 #endif
-#include "guestCaps.h"
 #include "rpcChannel.h"
+#include "vmware/guestrpc/capabilities.h"
 
 /**
  * Error reporting macro. Call this if the app encounters an error

diff --git a/open-vm-tools/lib/include/guestCaps.h b/open-vm-tools/lib/include/vmware/guestrpc/capabilities.h
similarity index 100%
rename from open-vm-tools/lib/include/guestCaps.h
rename to open-vm-tools/lib/include/vmware/guestrpc/capabilities.h

diff --git a/open-vm-tools/lib/unity/unity.c b/open-vm-tools/lib/unity/unity.c
index 19190fed76ac39e09da6e6f349180fc4f075ab05..caeff0d0113a622b61dc445bfa7ada67d4bc0d0e 100644 (file)
--- a/open-vm-tools/lib/unity/unity.c
+++ b/open-vm-tools/lib/unity/unity.c
@@ -51,7 +51,6 @@
 #include "unityDebug.h"
 #include "dynxdr.h"
 #include "guestrpc/unityActive.h"
-#include "guestCaps.h"
 #include "appUtil.h"
 #include <stdio.h>
 
@@ -446,7 +445,9 @@ Unity_InitBackdoor(struct RpcIn *rpcIn)   // IN
 void
 Unity_SetActiveDnDDetWnd(UnityDnD *state)
 {
-   UnityPlatformSetActiveDnDDetWnd(unity.up, state);
+   if (unity.up != NULL) {
+      UnityPlatformSetActiveDnDDetWnd(unity.up, state);
+   }
 }
 
 
@@ -1871,12 +1872,6 @@ UnityTcloSetDesktopActive(char const **result,  // OUT
       goto error;
    }
 
-   /*
-    * Update the uwt with the new active desktop info.
-    */
-
-   UnityWindowTracker_ChangeActiveDesktop(&unity.tracker, desktopId);
-
    return RpcIn_SetRetVals(result, resultLen,
                            "",
                            TRUE);
@@ -1934,6 +1929,16 @@ UnityTcloSetWindowDesktop(char const **result,  // OUT
       goto error;
    }
 
+   /*
+    * Set the desktop id for this window in the tracker.
+    * We need to do this before moving the window since on MS Windows platforms
+    * moving the window will hide it and there's a danger that we may enumerate the
+    * hidden window before changing it's desktop ID. The Window tracker will ignore
+    * hidden windows on the current desktop - which ultimately can lead to this window
+    * being reaped from the tracker.
+    */
+   UnityWindowTracker_ChangeWindowDesktop(&unity.tracker, windowId, desktopId);
+
    /*
     * Call the platform specific function to move the window to the
     * specified desktop.
@@ -1944,8 +1949,6 @@ UnityTcloSetWindowDesktop(char const **result,  // OUT
       goto error;
    }
 
-   UnityWindowTracker_ChangeWindowDesktop(&unity.tracker, windowId, desktopId);
-
    return RpcIn_SetRetVals(result, resultLen,
                            "",
                            TRUE);