From 0c24ade66862ea30007fd563f60ca95fb404fa49 Mon Sep 17 00:00:00 2001
From: Eric Brown <eric@securelink.com>
Date: Fri, 2 Mar 2018 12:42:04 -0600
Subject: [PATCH] Misc fixes for Windows clients

---
 client/Windows/wf_event.c | 2 +-
 libfreerdp/codec/planar.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c
index 288a60e..fbb214f 100644
--- a/client/Windows/wf_event.c
+++ b/client/Windows/wf_event.c
@@ -567,7 +567,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam,
 			break;
 
 		case WM_SETCURSOR:
-			if (LOWORD(lParam) == HTCLIENT)
+			if (wfc && LOWORD(lParam) == HTCLIENT)
 				SetCursor(wfc->hDefaultCursor);
 			else
 				DefWindowProc(hWnd, Msg, wParam, lParam);
diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c
index e05b21a..deb2763 100644
--- a/libfreerdp/codec/planar.c
+++ b/libfreerdp/codec/planar.c
@@ -614,9 +614,14 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar,
 	}
 	else /* YCoCg */
 	{
+		UINT32 TempFormat;
 		BYTE* pTempData = planar->pTempData;
 		UINT32 nTempStep = planar->nTempStep;
-		UINT32 TempFormat = PIXEL_FORMAT_BGRA32;
+
+		if (alpha)
+			TempFormat = PIXEL_FORMAT_BGRA32;
+		else
+			TempFormat = PIXEL_FORMAT_BGRX32;
 
 		if (!pTempData)
 			return FALSE;
-- 
2.7.4