Merge pull request #144 from langazov/master

Fix compilation issues in VS2015

4 files changed, 43 insertions, 42 deletions

diff --git a/wsgate/Primary.cpp b/wsgate/Primary.cpp
index aab9ae4..1e678d9 100644
--- a/wsgate/Primary.cpp
+++ b/wsgate/Primary.cpp
@@ -40,28 +40,28 @@ namespace wsgate {
 
     void Primary::Register(freerdp *rdp) {
         log::debug << __PRETTY_FUNCTION__ << endl;
-        rdp->update->primary->DstBlt = cbDstBlt;
-        rdp->update->primary->PatBlt = cbPatBlt;
-        rdp->update->primary->ScrBlt = cbScrBlt;
-        rdp->update->primary->OpaqueRect = cbOpaqueRect;
-        rdp->update->primary->DrawNineGrid = cbDrawNineGrid;
-        rdp->update->primary->MultiDstBlt = cbMultiDstBlt;
-        rdp->update->primary->MultiPatBlt = cbMultiPatBlt;
-        rdp->update->primary->MultiScrBlt = cbMultiScrBlt;
-        rdp->update->primary->MultiOpaqueRect = cbMultiOpaqueRect;
-        rdp->update->primary->MultiDrawNineGrid = cbMultiDrawNineGrid;
-        rdp->update->primary->LineTo = cbLineTo;
-        rdp->update->primary->Polyline = cbPolyline;
-        rdp->update->primary->MemBlt = cbMemBlt;
-        rdp->update->primary->Mem3Blt = cbMem3Blt;
-        rdp->update->primary->SaveBitmap = cbSaveBitmap;
-        rdp->update->primary->GlyphIndex = cbGlyphIndex;
-        rdp->update->primary->FastIndex = cbFastIndex;
-        rdp->update->primary->FastGlyph = cbFastGlyph;
-        rdp->update->primary->PolygonSC = cbPolygonSC;
-        rdp->update->primary->PolygonCB = cbPolygonCB;
-        rdp->update->primary->EllipseSC = cbEllipseSC;
-        rdp->update->primary->EllipseCB = cbEllipseCB;
+        rdp->update->primary->DstBlt = reinterpret_cast<pDstBlt>(cbDstBlt);
+        rdp->update->primary->PatBlt = reinterpret_cast<pPatBlt>(cbPatBlt);
+        rdp->update->primary->ScrBlt = reinterpret_cast<pScrBlt>(cbScrBlt);
+        rdp->update->primary->OpaqueRect = reinterpret_cast<pOpaqueRect>(cbOpaqueRect);
+        rdp->update->primary->DrawNineGrid = reinterpret_cast<pDrawNineGrid>(cbDrawNineGrid);
+        rdp->update->primary->MultiDstBlt = reinterpret_cast<pMultiDstBlt>(cbMultiDstBlt);
+        rdp->update->primary->MultiPatBlt = reinterpret_cast<pMultiPatBlt>(cbMultiPatBlt);
+        rdp->update->primary->MultiScrBlt = reinterpret_cast<pMultiScrBlt>(cbMultiScrBlt);
+        rdp->update->primary->MultiOpaqueRect = reinterpret_cast<pMultiOpaqueRect>(cbMultiOpaqueRect);
+        rdp->update->primary->MultiDrawNineGrid = reinterpret_cast<pMultiDrawNineGrid>(cbMultiDrawNineGrid);
+        rdp->update->primary->LineTo = reinterpret_cast<pLineTo>(cbLineTo);
+        rdp->update->primary->Polyline = reinterpret_cast<pPolyline>(cbPolyline);
+        rdp->update->primary->MemBlt = reinterpret_cast<pMemBlt>(cbMemBlt);
+        rdp->update->primary->Mem3Blt = reinterpret_cast<pMem3Blt>(cbMem3Blt);
+        rdp->update->primary->SaveBitmap = reinterpret_cast<pSaveBitmap>(cbSaveBitmap);
+        rdp->update->primary->GlyphIndex = reinterpret_cast<pGlyphIndex>(cbGlyphIndex);
+        rdp->update->primary->FastIndex = reinterpret_cast<pFastIndex>(cbFastIndex);
+        rdp->update->primary->FastGlyph = reinterpret_cast<pFastGlyph>(cbFastGlyph);
+        rdp->update->primary->PolygonSC = reinterpret_cast<pPolygonSC>(cbPolygonSC);
+        rdp->update->primary->PolygonCB = reinterpret_cast<pPolygonCB>(cbPolygonCB);
+        rdp->update->primary->EllipseSC = reinterpret_cast<pEllipseSC>(cbEllipseSC);
+        rdp->update->primary->EllipseCB = reinterpret_cast<pEllipseCB>(cbEllipseCB);
     }
 
     void Primary::DstBlt(rdpContext*, DSTBLT_ORDER*) {
diff --git a/wsgate/RDP.cpp b/wsgate/RDP.cpp
index 1eca376..dae424f 100644
--- a/wsgate/RDP.cpp
+++ b/wsgate/RDP.cpp
@@ -345,7 +345,7 @@ namespace wsgate {
         m_freerdp->ContextNew = cbContextNew;
         m_freerdp->ContextFree = cbContextFree;
         m_freerdp->Authenticate = cbAuthenticate;
-        m_freerdp->VerifyCertificate = cbVerifyCertificate;
+        m_freerdp->VerifyCertificate = reinterpret_cast<pVerifyCertificate>(cbVerifyCertificate);
 
         freerdp_context_new(m_freerdp);
         reinterpret_cast<wsgContext *>(m_freerdp->context)->pRDP = this;
@@ -390,6 +390,7 @@ namespace wsgate {
             m_rdpSettings->PreconnectionBlob = strdup(pcb.c_str());
         }
 
+        m_rdpSettings->SoftwareGdi = true;
         m_rdpSettings->DesktopWidth = params.width;
         m_rdpSettings->DesktopHeight = params.height;
 
@@ -840,11 +841,11 @@ namespace wsgate {
         rdpPointer p;
         memset(&p, 0, sizeof(p));
         p.size = sizeof(MyPointer);
-        p.New = cbPointer_New;
-        p.Free = cbPointer_Free;
-        p.Set = cbPointer_Set;
-        p.SetNull = cbPointer_SetNull;
-        p.SetDefault = cbPointer_SetDefault;
+        p.New = reinterpret_cast<pPointer_New>(cbPointer_New);
+        p.Free = reinterpret_cast<pPointer_Free>(cbPointer_Free);
+        p.Set = reinterpret_cast<pPointer_Set>(cbPointer_Set);
+        p.SetNull = reinterpret_cast<pPointer_SetNull>(cbPointer_SetNull);
+        p.SetDefault = reinterpret_cast<pPointer_SetDefault>(cbPointer_SetDefault);
         graphics_register_pointer(rdp->context->graphics, &p);
         pointer_cache_register_callbacks(rdp->update);
 
diff --git a/wsgate/Update.cpp b/wsgate/Update.cpp
index 605ac7b..1714b72 100644
--- a/wsgate/Update.cpp
+++ b/wsgate/Update.cpp
@@ -41,18 +41,18 @@ namespace wsgate {
 
     void Update::Register(freerdp *rdp) {
         log::debug << __PRETTY_FUNCTION__ << endl;
-        rdp->update->BeginPaint = cbBeginPaint;
-        rdp->update->EndPaint = cbEndPaint;
-        rdp->update->SetBounds = cbSetBounds;
-        rdp->update->Synchronize = cbSynchronize;
-        rdp->update->DesktopResize = cbDesktopResize;
-        rdp->update->BitmapUpdate = cbBitmapUpdate;
-        rdp->update->Palette = cbPalette;
-        rdp->update->PlaySound = cbPlaySound;
-        rdp->update->SurfaceBits = cbSurfaceBits;
-
-        rdp->update->RefreshRect = cbRefreshRect;
-        rdp->update->SuppressOutput = cbSuppressOutput;
+        rdp->update->BeginPaint = reinterpret_cast<pBeginPaint>(cbBeginPaint);
+        rdp->update->EndPaint = reinterpret_cast<pEndPaint>(cbEndPaint);
+        rdp->update->SetBounds = reinterpret_cast<pSetBounds>(cbSetBounds);
+        rdp->update->Synchronize = reinterpret_cast<pSynchronize>(cbSynchronize);
+        rdp->update->DesktopResize = reinterpret_cast<pDesktopResize>(cbDesktopResize);
+        rdp->update->BitmapUpdate = reinterpret_cast<pBitmapUpdate>(cbBitmapUpdate);
+        rdp->update->Palette = reinterpret_cast<pPalette>(cbPalette);
+        rdp->update->PlaySound = reinterpret_cast<pPlaySound>(cbPlaySound);
+        rdp->update->SurfaceBits = reinterpret_cast<pSurfaceBits>(cbSurfaceBits);
+
+        rdp->update->RefreshRect = reinterpret_cast<pRefreshRect>(cbRefreshRect);
+        rdp->update->SuppressOutput = reinterpret_cast<pSuppressOutput>(cbSuppressOutput);
     }
 
     void Update::BeginPaint(rdpContext*) {
diff --git a/wsgate/webroot/index-debug.html b/wsgate/webroot/index-debug.html
index de0e4df..7cf042c 100644
--- a/wsgate/webroot/index-debug.html
+++ b/wsgate/webroot/index-debug.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-	<link href='http://fonts.googleapis.com/css?family=Quicksand' rel='stylesheet' type='text/css'>
+	<link href='//fonts.googleapis.com/css?family=Quicksand' rel='stylesheet' type='text/css'>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <title>FreeRDP WebConnect: offline</title>
@@ -513,7 +513,7 @@
 	    <tr><td>
 		<div style="margin-left:auto; margin-right:auto; width:60%; position:relative;">
 		<a href="http://www.cloudbase.it">
-		<img src='http://cloudbase.it/wp-content/uploads/2012/10/CBSL_web_logo3.png' style="margin-left:auto; margin-right:auto;">
+		<img src='//cloudbase.it/wp-content/uploads/2012/10/CBSL_web_logo3.png' style="margin-left:auto; margin-right:auto;">
 		</a></div></img>
             </td></tr>
             <tr>