Merge branch 'master' of github.com:awakecoding/FreeRDP

server/Windows/CMakeLists.txt

@@ -54,7 +54,6 @@ if(WITH_WIN8)
 endif()
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dsound)
-
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server)
 
 set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS

server/Windows/wf_rdpsnd.c

@@ -26,6 +26,10 @@
 
 #include <winpr/windows.h>
 
+#define INITGUID
+#include <initguid.h>
+#include <objbase.h>
+
 #define CINTERFACE
 #include <mmsystem.h>
 #include <dsound.h>

winpr/libwinpr/sspi/test/TestSchannel.c

@@ -72,7 +72,7 @@ static void* schannel_test_server_thread(void* arg)
 		//return NULL;
 	}
 
-	pCertContext = CertFindCertificateInStore(hCertStore, X509_ASN_ENCODING, 0, CERT_FIND_HAS_PRIVATE_KEY, NULL, NULL);
+	pCertContext = CertFindCertificateInStore(hCertStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL);
 
 	if (!pCertContext)
 	{