From 95b03f96eff0422fde2117f098729bf9352e6dbf Mon Sep 17 00:00:00 2001
From: louyihua <SuperMouseLyh@hotmail.com>
Date: Wed, 21 Dec 2011 08:48:13 +0800
Subject: [PATCH 1/2] libfreerdp-core: avoid macro redefinition under win32

---
 include/freerdp/secondary.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h
index b4c3138cf..382b3222b 100644
--- a/include/freerdp/secondary.h
+++ b/include/freerdp/secondary.h
@@ -49,12 +49,14 @@
 #define BS_PATTERN			0x03
 #endif
 
-#define HS_HORIZONTAL			0x00
+#ifndef _WIN32
+#define HS_HORIZONTAL		0x00
 #define HS_VERTICAL			0x01
-#define HS_FDIAGONAL			0x02
-#define HS_BDIAGONAL			0x03
+#define HS_FDIAGONAL		0x02
+#define HS_BDIAGONAL		0x03
 #define HS_CROSS			0x04
-#define HS_DIAGCROSS			0x05
+#define HS_DIAGCROSS		0x05
+#endif
 
 #define SO_FLAG_DEFAULT_PLACEMENT	0x01
 #define SO_HORIZONTAL			0x02

From d095c2398e7a4e15c282bc50253631bc47565e68 Mon Sep 17 00:00:00 2001
From: louyihua <SuperMouseLyh@hotmail.com>
Date: Wed, 21 Dec 2011 08:50:47 +0800
Subject: [PATCH 2/2] libfreerdp-utils: fix a handle leak while creating
 threads under win32

---
 libfreerdp-utils/thread.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libfreerdp-utils/thread.c b/libfreerdp-utils/thread.c
index 4dfdd5936..d6b3b0b33 100644
--- a/libfreerdp-utils/thread.c
+++ b/libfreerdp-utils/thread.c
@@ -24,6 +24,9 @@
 
 #ifdef _WIN32
 #include <Windows.h>
+#ifdef _MSC_VER
+#include <process.h>
+#endif
 #endif
 
 #include <freerdp/utils/sleep.h>
@@ -49,8 +52,11 @@ void freerdp_thread_start(freerdp_thread* thread, void* func, void* arg)
 
 #ifdef _WIN32
 	{
-		DWORD th;
-		CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, &th);
+#	ifdef _MSC_VER
+		CloseHandle((HANDLE)_beginthreadex(NULL, 0, func, arg, 0, NULL));
+#else
+		CloseHandle(CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, arg, 0, NULL));
+#endif
 	}
 #else
 	{