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 539a0b5..6381a16 100644
--- a/rfbplayer/FbsInputStream.cxx
+++ b/rfbplayer/FbsInputStream.cxx
@@ -46,7 +46,7 @@
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 @@
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::readUnsigned32() {
- byte buf[4];
+ U8 buf[4];
if (!readNByte(buf, 4))
return -1;
@@ -172,7 +172,7 @@
// 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 0a92802..b304aec 100644
--- 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;