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/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index c957c912f08388a4896892748b5ad77bc95fdfed..65df34def96a657e01cd7ec3f0dcbf7110297038 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -199,7 +199,7 @@ typedef enum GuestOSFamilyType {
 
 /* vmkernel (ESX) */
 #define STR_OS_ESX_4               "VMware ESX 4"
-#define STR_OS_ESX_5               "VMware ESX 5"
+#define STR_OS_ESX_5               "VMware ESXi 5"
 
 /* Linux */
 #define STR_OS_ANNVIX              "Annvix"

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 83d80e554a157a2a3f4a8db2effa4bda24721264..babab2fa4e1c79c14eb6ba3917d17e6ded1a93e7 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -58,7 +58,7 @@
 /*
  * Brief names are used when the VMware prefix is not wanted.
  */
-#define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESX"
+#define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESXi"
 #define PRODUCT_WGS_BRIEF_NAME "Server"
 #define PRODUCT_GSX_BRIEF_NAME "GSX Server"
 #define PRODUCT_WORKSTATION_BRIEF_NAME "Workstation"
@@ -82,7 +82,7 @@
 #define VMWARE_TOOLS_SHORT_NAME MAKE_NAME("Tools")
 
 #define PRODUCT_SCALABLE_SERVER_NAME MAKE_NAME(PRODUCT_SCALABLE_SERVER_BRIEF_NAME)
-#define PRODUCT_ESX_SMP_NAME MAKE_NAME("Virtual SMP for ESX Server")
+#define PRODUCT_ESX_SMP_NAME MAKE_NAME("Virtual SMP for ESXi Server")
 #define PRODUCT_WGS_NAME MAKE_NAME(PRODUCT_WGS_BRIEF_NAME)
 #define PRODUCT_GSX_NAME MAKE_NAME(PRODUCT_GSX_BRIEF_NAME)
 #define PRODUCT_GSX_SMP_NAME MAKE_NAME("Virtual SMP for GSX Server")
@@ -131,7 +131,7 @@
 
 #define PRODUCT_SDK_NAME MAKE_NAME("SDK")
 
-#define PRODUCT_DDK_NAME MAKE_NAME("ESX DDK")
+#define PRODUCT_DDK_NAME MAKE_NAME("ESXi DDK")
 
 // XXX I think these are dead and can be removed -clayton
 // #define PRODUCT_VDM_SHORT_NAME "VDM"
@@ -186,11 +186,11 @@
 /*
  * VMRC ActiveX CLSIDs and ProgIDs
  */
-#define PRODUCT_VMRC_PLUGIN_GUID_EMBEDDED      291BA977-564B-4626-B868-A968FB8D4591
-#define PRODUCT_VMRC_PLUGIN_GUID_TYPELIB       70ABCAB7-6B45-4555-ABFC-8BC686E5ACFE
+#define PRODUCT_VMRC_PLUGIN_GUID_EMBEDDED      6FB1850B-AC2A-4AEA-9847-EBCE6AB2A62E
+#define PRODUCT_VMRC_PLUGIN_GUID_TYPELIB       EC950991-C7CE-455C-ABF3-12FC11F9C136
 #define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "VMware.RemoteConsole"
 #define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED    PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "." \
-                                               XSTR(VMRC_PLUGIN_VERSION_BASE)
+                                               VMRC_PLUGIN_VERSION_NUMBER
 
 /*
  * VMRC MIME types
@@ -204,7 +204,7 @@
 #endif
 
 #define PRODUCT_VMRC_PLUGIN_CURRENT_MIMETYPE \
-   "application/x-vmware-remote-console-2011"
+   "application/x-vmware-remote-console"
 
 /*
  * legacy plugin mimetypes (currently unused but here for reference)
@@ -405,7 +405,7 @@
  * file.
  */
 #   if defined(VMX86_SERVER)
-#      define PRODUCT_NAME_FOR_LICENSE "VMware ESX Server"
+#      define PRODUCT_NAME_FOR_LICENSE "VMware ESXi Server"
 #      define PRODUCT_SMP_NAME_FOR_LICENSE PRODUCT_ESX_SMP_NAME
 #   elif defined(VMX86_DESKTOP)
 #      if defined(__APPLE__)