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/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c
index 900a339bc42c2454231c8634dfca95f34bf43f24..6fc60c33312c2dbf2470148718718fe53926a58a 100644 (file)
--- a/open-vm-tools/lib/foundryMsg/foundryMsg.c
+++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c
@@ -327,10 +327,8 @@ static const VixCommandInfo vixCommandInfoTable[] = {
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_REPLAY_SPEED,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_ANSWER_USER_MESSAGE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_CLIENT_LOCALE,
-                           VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_PERFORMANCE_DATA,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REFRESH_RUNTIME_PROPERTIES,
@@ -374,10 +372,8 @@ static const VixCommandInfo vixCommandInfoTable[] = {
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_REPLAY_STATE,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
-   
    VIX_DEFINE_UNUSED_COMMAND,
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CANCEL_USER_PROGRESS_MESSAGE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
    /* GET_VMX_DEVICE_STATE is needed for the initial handshake. */   
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_VMX_DEVICE_STATE,
                            VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),

diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index da58e8931bea433f8e6756a0c3c6b688fd6a1993..c43586a1d20a004e90b9a6c73e898fc50cc43c51 100644 (file)
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -1866,175 +1866,6 @@ VixMsgSampleCommandResponse;
 // End of "HOWTO: Adding a new Vix Command. Step 3."
 
 
-
-/*
- * **********************************************************
- * Report and manage the state of a Msg_Post dialogs.
- */
-
-/*
- * This is used to report a MsgPost is opening.
- * This is the non-localized version. It passes the original format string
- * and a list of vararg-style parameters.
- *
- * See VixMsgOpenMsgPostEventLocalized for the localized version.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgOpenMsgPostEvent {
-   VixMsgEventHeader          eventHeader;
-
-   int32                      dialogType;
-   uint64                     dialogCookie;
-   int32                      dialogOptions;
-
-   int32                      severity;
-   int32                      defaultAnswer;
-   int32                      percent;
-   int32                      cancelButton;
-   int32                      hintOptions;
-
-   uint32                     localeStrLength;
-   int32                      numMessages;
-   int32                      numButtons;
-
-   /*
-    * Followed by:
-    *       A locale string (a null-terminated string)
-    *       A list of messages, each is stored in one VixMsgDialogStr.
-    *       A list of button strings (each is a null-terminated string.
-    */
-}
-#include "vmware_pack_end.h"
-VixMsgOpenMsgPostEvent;
-
-/*
- * These are the flags set in the dialogOptions field.
- */
-enum VixMsgPostStateValues {
-   VIX_COMMAND_DIALOG_OPTIONS_VMX_IS_BLOCKED       = 0x01,
-};
-
-
-/*
- * This is one string in the message. It corresponds to a
- * single MsgList object.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgDialogStr {
-   uint32         idLength;
-   uint32         formatLength;
-   int32          numArgs;
-   /*
-    * Followed by:
-    *       The ID string (with NULL terminator)
-    *       The format string (with NULL terminator)
-    *       A list of arguments, each is one VixMsgDialogStrArg.
-    */
-}
-#include "vmware_pack_end.h"
-VixMsgDialogStr;
-
-
-/*
- * This is one argument to the message. It corresponds to a
- * single MsgFmt_Arg object.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgDialogStrArg {
-   int32          argType;
-   uint32         argSize;
-   /*
-    * Followed by the actual argument data.
-    */
-}
-#include "vmware_pack_end.h"
-VixMsgDialogStrArg;
-
-
-/*
- * This is used to report a MsgPost is closing.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgCloseUIDialogEvent {
-   VixMsgEventHeader          eventHeader;
-
-   uint64                     dialogCookie;
-   int32                      numMessages;
-
-   /*
-    * Followed by:
-    *       A list of strings, each is one MsgPost Id.
-    */
-}
-#include "vmware_pack_end.h"
-VixMsgCloseUIDialogEvent;
-
-
-/*
- * Answer a Msg_Post post/hint/question
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgAnswerMsgPost {
-   VixCommandRequestHeader   header;
-
-   uint64                    dialogCookie;
-
-   int32                     options;
-
-   int32                     answer;
-   void                      *progressState;
-
-   uint32                    idStrSize;
-   uint32                    propertyListBufferSize;
-
-   /*
-    * Followed by:
-    *       msgIdStr.
-    *       The serialized properties
-    */
-}
-#include "vmware_pack_end.h"
-VixMsgAnswerMsgPost;
-
-
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgSetLocaleRequest {
-   VixCommandRequestHeader header;
-
-   int32                   localeOptions;
-   
-   uint32                  localeStrLength;
-   char                    localeStr[1];
-   // This is followed by the country code string.
-}
-#include "vmware_pack_end.h"
-VixMsgSetLocaleRequest;
-
-
-
-/*
- * This is used to report progress.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgLazyProgressEvent {
-   VixMsgEventHeader          eventHeader;
-
-   uint64                     dialogCookie;
-   int32                      percent;
-}
-#include "vmware_pack_end.h"
-VixMsgLazyProgressEvent;
-
-
-
 /*
  * **********************************************************
  *  Debugger related commands.
@@ -2372,8 +2203,8 @@ enum {
    VIX_COMMAND_GET_SNAPSHOT_LOG_INFO            = 124,
    VIX_COMMAND_SET_REPLAY_SPEED                 = 125,
 
-   VIX_COMMAND_ANSWER_USER_MESSAGE              = 126,
-   VIX_COMMAND_SET_CLIENT_LOCALE                = 127,
+   /* DEPRECATED VIX_COMMAND_ANSWER_USER_MESSAGE              = 126, */
+   /* DEPRECATED VIX_COMMAND_SET_CLIENT_LOCALE                = 127, */
 
    VIX_COMMAND_GET_PERFORMANCE_DATA             = 128,
 
@@ -2404,7 +2235,7 @@ enum {
    VIX_COMMAND_SET_REPLAY_STATE                 = 147,
    VIX_COMMAND_REMOVE_REPLAY_STATE              = 148,
 
-   VIX_COMMAND_CANCEL_USER_PROGRESS_MESSAGE     = 150,
+   /* DEPRECATED VIX_COMMAND_CANCEL_USER_PROGRESS_MESSAGE     = 150, */
    
    VIX_COMMAND_GET_VMX_DEVICE_STATE             = 151,