Merged the changes from branch/merge-with-vnc-4.1.1, revisions 564:565.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@567 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/rfbplayer/FbsInputStream.cxx b/rfbplayer/FbsInputStream.cxx
index 539a0b5e150de02ad794822651cf352eb536f008..6381a166462d98261ce6c23ba0e837e4c8144853 100644 (file)
--- a/rfbplayer/FbsInputStream.cxx
+++ b/rfbplayer/FbsInputStream.cxx
@@ -46,7 +46,7 @@ FbsInputStream::FbsInputStream(char* FileName) {
     throw rfb::Exception(msg);
   }
 
-  byte b[12];
+  U8 b[12];
   readNByte(b, 12);
 
   if (b[0] != 'F' || b[1] != 'B' || b[2] != 'S' || b[3] != ' ' ||
@@ -114,7 +114,7 @@ int FbsInputStream::overrun(int itemSize, int nItems, bool wait=true) {
     if (start != NULL)
       delete [] start;
     int realSize = (bufferSize + 3) & 0xFFFFFFFC; // padding to multiple of 32-bits
-    ptr = start = new byte[realSize + n];
+    ptr = start = new U8[realSize + n];
     end = ptr + bufferSize + n;
     if (n) {
       memmove(start, tmp, n);
@@ -158,7 +158,7 @@ int FbsInputStream::overrun(int itemSize, int nItems, bool wait=true) {
 }
 
 int FbsInputStream::readUnsigned32() {
-  byte buf[4];
+  U8 buf[4];
   if (!readNByte(buf, 4))
     return -1;
 
@@ -172,7 +172,7 @@ int FbsInputStream::readUnsigned32() {
 // Read n-bytes from the session file
 //
 
-bool FbsInputStream::readNByte(byte b[], int n) {
+bool FbsInputStream::readNByte(U8 b[], int n) {
   int off = 0;
   
   while (off != n) {

diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 0a928022f7b74c4dd09a7007cee85c6a458f4a9a..b304aececc3abff5eb2cba85ed621022a4c2b9ef 100644 (file)
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -17,18 +17,24 @@
  */
 
 // -=- RFB Player for Win32
-
 #include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
+
+#include <rfb/LogWriter.h>
 
 #include <rfb_win32/AboutDialog.h>
+#include <rfb_win32/DeviceContext.h>
+#include <rfb_win32/MsgBox.h>
 #include <rfb_win32/WMShatter.h>
+#include <rfb_win32/Win32Util.h>
 
 #include <rfbplayer/rfbplayer.h>
 #include <rfbplayer/ChoosePixelFormatDialog.h>
 #include <rfbplayer/GotoPosDialog.h>
 #include <rfbplayer/InfoDialog.h>
 #include <rfbplayer/SessionInfoDialog.h>
-  
+
 using namespace rfb;
 using namespace rfb::win32;