Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/system.h b/open-vm-tools/lib/include/system.h
index bf6484dccabccef74b6086d15d48749dea18a466..d1e6b0ba1ceb0cea3ea16ff2b1bee75d597da99c 100644 (file)
--- a/open-vm-tools/lib/include/system.h
+++ b/open-vm-tools/lib/include/system.h
@@ -44,6 +44,11 @@ char *System_GetEnv(Bool global, const char *valueName);
 int System_SetEnv(Bool global, const char *valueName, const char *value);
 
 #ifdef _WIN32
+typedef enum AeroStateCommand {
+   AeroCommand_Enable,
+   AeroCommand_Disable,
+} AeroStateCommand;
+
 /*
  * Representation of monitors gathered by System_GetMonitors.
  */
@@ -76,6 +81,7 @@ Bool System_DisableAndKillScreenSaver(void);
 DWORD System_GetServiceState(LPCWSTR szServiceName);
 DblLnkLst_Links *System_GetMonitors();
 void System_SetFocusedWindow(HWND windowToFocus, Bool force);
+Bool System_SetAeroState(AeroStateCommand command, AeroStateCommand *oldState);
 #endif
 
 

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index ed1b492b4f3f45271a8b0ba8469f002c12003237..dc01a81415d744e0da70bb48aee40720f28e0177 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -205,7 +205,7 @@
 #define PLAYER_VERSION "e.x.p"
 #define V2V_VERSION "e.x.p"
 #define V2V_FILE_VERSION 1,0,0,0
-#define FUSION_VERSION "3.0.0"
+#define FUSION_VERSION "3.0.1"
 
 // These must match VIE_FILEVERSION above
 #define SYSIMAGE_VERSION "4.0.0"

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
index 455de62ea0f245f44817a088ef3c43f4dd443dc4..210dd38e59c4304d4ad00490f9e81b0c31189b0a 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
@@ -523,7 +523,6 @@ ToolsOnLoad(ToolsAppCtx *ctx)
       { "DisplayTopology_Set",          &ResolutionDisplayTopologySetCB },
 #if defined(RESOLUTION_WIN32)
       { "DisplayTopologyModes_Set",     &ResolutionDisplayTopologyModesSetCB },
-      { "ChangeHost3DAvailabilityHint", &ResolutionChangeHost3DAvailabilityHintCB }
 #endif
    };