attempt to fix more warnings!

4 files changed, 11 insertions, 10 deletions

diff --git a/vdagent/image.cpp b/vdagent/image.cpp
index c0bcdb5..e4adcd9 100644
--- a/vdagent/image.cpp
+++ b/vdagent/image.cpp
@@ -64,7 +64,7 @@ HANDLE get_image_handle(const VDAgentClipboard& clipboard, uint32_t size, UINT&
 }
 
 uint8_t* get_raw_clipboard_image(const VDAgentClipboardRequest& clipboard_request,
-                                 HANDLE clip_data, long& new_size)
+                                 HANDLE clip_data, ssize_t& new_size)
 {
     new_size = 0;
 
@@ -133,7 +133,7 @@ public:
     BitmapCoder() {};
     size_t get_dib_size(const uint8_t *data, size_t size);
     void get_dib_data(uint8_t *dib, const uint8_t *data, size_t size);
-    uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, long &size);
+    uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, ssize_t &size);
 };
 
 size_t BitmapCoder::get_dib_size(const uint8_t *data, size_t size)
@@ -150,7 +150,7 @@ void BitmapCoder::get_dib_data(uint8_t *dib, const uint8_t *data, size_t size)
     memcpy(dib, data + (size - new_size), new_size);
 }
 
-uint8_t *BitmapCoder::from_bitmap(const BITMAPINFO& info, const void *bits, long &size)
+uint8_t *BitmapCoder::from_bitmap(const BITMAPINFO& info, const void *bits, ssize_t &size)
 {
     BITMAPFILEHEADER file_hdr;
 
diff --git a/vdagent/image.h b/vdagent/image.h
index 326d7f9..29466bf 100644
--- a/vdagent/image.h
+++ b/vdagent/image.h
@@ -25,7 +25,7 @@ public:
     virtual ~ImageCoder() {}
     virtual size_t get_dib_size(const uint8_t *data, size_t size)=0;
     virtual void get_dib_data(uint8_t *dib, const uint8_t *data, size_t size)=0;
-    virtual uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, long &size)=0;
+    virtual uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, ssize_t &size)=0;
 private:
     ImageCoder(const ImageCoder& rhs);
     void operator=(const ImageCoder &rhs);
@@ -61,7 +61,7 @@ HANDLE get_image_handle(const VDAgentClipboard& clipboard, uint32_t size, UINT&
  * @param[out] new_size           size of returned data
  */
 uint8_t* get_raw_clipboard_image(const VDAgentClipboardRequest& clipboard_request,
-                                 HANDLE clip_data, long& new_size);
+                                 HANDLE clip_data, ssize_t& new_size);
 
 /**
  * Free data returned by get_raw_clipboard_image
diff --git a/vdagent/imagepng.cpp b/vdagent/imagepng.cpp
index 78b4188..8f22d6c 100644
--- a/vdagent/imagepng.cpp
+++ b/vdagent/imagepng.cpp
@@ -29,7 +29,7 @@ public:
     PngCoder() {};
     size_t get_dib_size(const uint8_t *data, size_t size);
     void get_dib_data(uint8_t *dib, const uint8_t *data, size_t size);
-    uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, long &size);
+    uint8_t *from_bitmap(const BITMAPINFO& info, const void *bits, ssize_t &size);
 private:
     size_t convert_to_dib(uint8_t *out_buf, const uint8_t *data, size_t size);
 };
@@ -271,7 +271,7 @@ void PngCoder::get_dib_data(uint8_t *dib, const uint8_t *data, size_t size)
     convert_to_dib(dib, data, size);
 }
 
-uint8_t *PngCoder::from_bitmap(const BITMAPINFO& bmp_info, const void *bits, long &size)
+uint8_t *PngCoder::from_bitmap(const BITMAPINFO& bmp_info, const void *bits, ssize_t &size)
 {
     // this vector is here to avoid leaking resources if libpng use setjmp/longjmp
     std::vector<png_color> palette;
diff --git a/vdagent/vdagent.cpp b/vdagent/vdagent.cpp
index df794b8..730b914 100644
--- a/vdagent/vdagent.cpp
+++ b/vdagent/vdagent.cpp
@@ -28,6 +28,7 @@
 #include <queue>
 #include <set>
 #include <vector>
+#include <cinttypes>
 
 #define VD_AGENT_LOG_PATH       TEXT("%svdagent.log")
 #define VD_AGENT_WINCLASS_NAME  TEXT("VDAGENT")
@@ -1101,7 +1102,7 @@ bool VDAgent::handle_clipboard_request(const VDAgentClipboardRequest* clipboard_
     UINT format;
     HANDLE clip_data;
     uint8_t* new_data = NULL;
-    long new_size = 0;
+    ssize_t new_size = 0;
     size_t len = 0;
     VDAgentClipboard* clipboard = NULL;
 
@@ -1143,8 +1144,8 @@ bool VDAgent::handle_clipboard_request(const VDAgentClipboardRequest* clipboard_
         goto handle_clipboard_request_fail;
     }
     if ((_max_clipboard != -1) && (new_size > _max_clipboard)) {
-        vd_printf("clipboard is too large (%ld > %d), discarding",
-                  new_size, _max_clipboard);
+        vd_printf("clipboard is too large (%" PRIdPTR " > %d), discarding",
+                  (intptr_t) new_size, _max_clipboard);
         goto handle_clipboard_request_fail;
     }