From 0812a8e9fcf197eca618992b588272bc3677a031 Mon Sep 17 00:00:00 2001
From: Corey C <can.of.tuna@gmail.com>
Date: Tue, 19 Mar 2013 15:19:26 -0400
Subject: [PATCH] wfreerdp-server: fixed mirror driver unloading issue

---
 server/Windows/wf_mirage.c | 40 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/server/Windows/wf_mirage.c b/server/Windows/wf_mirage.c
index c81825f21..d9f3b49ab 100644
--- a/server/Windows/wf_mirage.c
+++ b/server/Windows/wf_mirage.c
@@ -187,29 +187,7 @@ BOOL wf_mirror_driver_update(wfInfo* wfi, int mode)
 	LONG disp_change_status;
 	DWORD dmf_devmodewext_magic_sig = 0xDF20C0DE;
 	
-	if (mode == MIRROR_LOAD)
-	{
-		//first let's get the virtual screen dimentions
-		wfi->virtscreen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-		wfi->virtscreen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-
-		/*
-		 * Will have to come back to this for supporting non primary displays and multimonitor setups
-		 */
-		/*dc = GetDC(NULL);
-		wfi->servscreen_width = GetDeviceCaps(dc, HORZRES);
-		wfi->servscreen_height = GetDeviceCaps(dc, VERTRES);
-		wfi->bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL);
-		ReleaseDC(NULL, dc);*/
-		
-	}
-	else if (mode == MIRROR_UNLOAD)
-	{
-		wfi->servscreen_width = 0;
-		wfi->servscreen_height = 0;
-		wfi->bitsPerPixel = 0;
-	}
-	else
+	if ( (mode != MIRROR_LOAD) && (mode != MIRROR_UNLOAD) )
 	{
 		printf("Invalid mirror mode!\n");
 		return FALSE;
@@ -227,11 +205,17 @@ BOOL wf_mirror_driver_update(wfInfo* wfi, int mode)
 	deviceMode->dmSize = sizeof(DEVMODE);
 	deviceMode->dmDriverExtra = drvExtraSaved;
 
-	deviceMode->dmPelsWidth = wfi->virtscreen_width;
-	deviceMode->dmPelsHeight = wfi->virtscreen_height;
-	deviceMode->dmBitsPerPel = wfi->bitsPerPixel;
-	deviceMode->dmPosition.x = wfi->servscreen_xoffset;
-	deviceMode->dmPosition.y = wfi->servscreen_yoffset;
+	if (mode == MIRROR_LOAD)
+	{
+		wfi->virtscreen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		wfi->virtscreen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+
+		deviceMode->dmPelsWidth = wfi->virtscreen_width;
+		deviceMode->dmPelsHeight = wfi->virtscreen_height;
+		deviceMode->dmBitsPerPel = wfi->bitsPerPixel;
+		deviceMode->dmPosition.x = wfi->servscreen_xoffset;
+		deviceMode->dmPosition.y = wfi->servscreen_yoffset;
+	}
 
 	deviceMode->dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_POSITION;