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

This commit is contained in:
Marc-André Moreau 2013-01-06 16:42:59 -05:00
commit 218773a04c
3 changed files with 5 additions and 2 deletions

View File

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

View File

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

View File

@ -72,7 +72,7 @@ static void* schannel_test_server_thread(void* arg)
//return NULL; //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) if (!pCertContext)
{ {