From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 24 Apr 2018 00:08:15 +0000 (-0700)
Subject: Common source file changes not directly applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a34b181de524b3f0d01cad90d3da184bde7ad99;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index 799e011e9..bcde63669 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -7337,8 +7337,13 @@ HgfsServerRename(HgfsInputParam *input)  // IN: Input params
    const char *cpNewName;
    size_t cpNewNameLen;
    HgfsInternalStatus status;
-   fileDesc srcFileDesc;
-   fileDesc targetFileDesc;
+#ifdef _WIN32
+   fileDesc srcFileDesc = INVALID_HANDLE_VALUE;
+   fileDesc targetFileDesc = INVALID_HANDLE_VALUE;
+#else
+   fileDesc srcFileDesc = -1;
+   fileDesc targetFileDesc = -1;
+#endif
    HgfsHandle srcFile;
    HgfsHandle targetFile;
    HgfsRenameHint hints;
diff --git a/open-vm-tools/lib/include/ghIntegrationCommon.h b/open-vm-tools/lib/include/ghIntegrationCommon.h
index c20b2196c..81806c06c 100644
--- a/open-vm-tools/lib/include/ghIntegrationCommon.h
+++ b/open-vm-tools/lib/include/ghIntegrationCommon.h
@@ -28,6 +28,7 @@
 /*
  * Common data structures and definitions used by Guest/Host Integration.
  */
+#define GHI_HGFS_SHARE_URL_SCHEME_UTF8 "x-vmware-share"
 #define GHI_HGFS_SHARE_URL_UTF8 "x-vmware-share://"
 #define GHI_HGFS_SHARE_URL      _T(GHI_HGFS_SHARE_URL_UTF8)
 
diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index d0ff097cc..cfcf67535 100644
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -1643,7 +1643,7 @@ Atomic_Sub32(Atomic_uint32 *var, // IN/OUT
 #endif /* VM_X86_ANY */
 #elif defined _MSC_VER
 #if _MSC_VER >= 1310
-   _InterlockedExchangeAdd((long *)&var->value, (long)-val);
+   _InterlockedExchangeAdd((long *)&var->value, -(long)val);
 #else
    __asm mov eax, val
    __asm mov ebx, var
@@ -2382,7 +2382,7 @@ Atomic_ReadSub64(Atomic_uint64 *var, // IN/OUT
 #if defined VM_ARM_64
    return _VMATOM_X(ROP, 64, TRUE, &var->value, sub, val);
 #else
-   return Atomic_ReadAdd64(var, -val);
+   return Atomic_ReadAdd64(var, -(int64)val);
 #endif
 }
 
@@ -2429,7 +2429,7 @@ Atomic_ReadInc64(Atomic_uint64 *var) // IN/OUT
 static INLINE uint64
 Atomic_ReadDec64(Atomic_uint64 *var) // IN/OUT
 {
-   return Atomic_ReadAdd64(var, CONST64U(-1));
+   return Atomic_ReadAdd64(var, (uint64)CONST64(-1));
 }
 
 
diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index dffb2aa1d..27820ff0a 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -268,8 +268,8 @@
 #define HOSTD_VERSION "e.x.p"
 #define RECOVERYLIBS_VERSION "2.0.0"
 #define PRECHECK_VERSION "e.x.p"
-#define VIEW_CLIENT_VERSION_NUMBER "4.5.1"
-#define VIEW_CLIENT_VERSION "4.7.0"
+#define VIEW_CLIENT_VERSION "4.8.0"
+#define VIEW_CLIENT_VERSION_NUMBER VIEW_CLIENT_VERSION
 #define VHSESDK_VERSION "1.0.0"
 #define VIEWVC_VERSION "14.0.0"