Fix build warnings

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/coinst/coinst.c b/src/coinst/coinst.c
index fd1e93b40bced756620d3ae39db0468ad19f75bb..59b3f6bf6ff04bb6f3602ffb530f0bd7d95ec2e5 100644 (file)
--- a/src/coinst/coinst.c
+++ b/src/coinst/coinst.c
@@ -110,15 +110,16 @@ GetErrorMessage(
     PTCHAR      Message;
     ULONG       Index;
 
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                  FORMAT_MESSAGE_FROM_SYSTEM |
-                  FORMAT_MESSAGE_IGNORE_INSERTS,
-                  NULL,
-                  Error,
-                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                  (LPTSTR)&Message,
-                  0,
-                  NULL);
+    if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                       FORMAT_MESSAGE_FROM_SYSTEM |
+                       FORMAT_MESSAGE_IGNORE_INSERTS,
+                       NULL,
+                       Error,
+                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                       (LPTSTR)&Message,
+                       0,
+                       NULL))
+        return NULL;
 
     for (Index = 0; Message[Index] != '\0'; Index++) {
         if (Message[Index] == '\r' || Message[Index] == '\n') {
@@ -243,14 +244,14 @@ AllowUpdate(
         goto fail3;
     }
 
+    RegCloseKey(ServiceKey);
+
 done:
     if (Value == 0) {
         Log("DISALLOWED");
         *Allow = FALSE;
     }
 
-    RegCloseKey(ServiceKey);
-
     Log("<====");
 
     return TRUE;

diff --git a/src/xenagent/devicelist.cpp b/src/xenagent/devicelist.cpp
index 4e86ce2ea4ee67c8921f1dcaf3af016f7c867b40..98caffb52171b93f7f277e6eacd2aa3701435a0b 100644 (file)
--- a/src/xenagent/devicelist.cpp
+++ b/src/xenagent/devicelist.cpp
@@ -130,6 +130,9 @@ CDeviceList::~CDeviceList()
     Stop();
 }
 
+#pragma warning(push)
+#pragma warning(disable:6102) // Using value from failed function call
+
 bool CDeviceList::Start(HANDLE handle, IDeviceCreator* impl)
 {
     Stop();
@@ -188,6 +191,8 @@ bool CDeviceList::Start(HANDLE handle, IDeviceCreator* impl)
     return true;
 }
 
+#pragma warning(pop)
+
 void CDeviceList::Stop()
 {
     if (m_notify != NULL)