libfreerdp-client: fix /pcb and /pcid

diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index a3a08a6..8461068 100644 (file)
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -96,6 +96,8 @@ COMMAND_LINE_ARGUMENT_A args[] =
        { "sec-ext", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "nla extended protocol security" },
        { "cert-name", COMMAND_LINE_VALUE_REQUIRED, "<name>", NULL, NULL, -1, NULL, "certificate name" },
        { "cert-ignore", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "ignore certificate" },
+       { "pcb", COMMAND_LINE_VALUE_REQUIRED, "<blob>", NULL, NULL, -1, NULL, "Preconnection Blob" },
+       { "pcid", COMMAND_LINE_VALUE_REQUIRED, "<id>", NULL, NULL, -1, NULL, "Preconnection Id" },
        { "authentication", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, "authentication (hack!)" },
        { "encryption", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, "encryption (hack!)" },
        { "grab-keyboard", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, "grab keyboard" },

diff --git a/winpr/libwinpr/crypto/cert.c b/winpr/libwinpr/crypto/cert.c
index 5309c81..56f38f5 100644 (file)
--- a/winpr/libwinpr/crypto/cert.c
+++ b/winpr/libwinpr/crypto/cert.c
@@ -24,6 +24,24 @@
 #include <winpr/crypto.h>
 
 /**
+ * CertOpenStore
+ * CertCloseStore
+ * CertControlStore
+ * CertDuplicateStore
+ * CertSaveStore
+ * CertRegisterPhysicalStore
+ * CertRegisterSystemStore
+ * CertAddStoreToCollection
+ * CertRemoveStoreFromCollection
+ * CertOpenSystemStoreA
+ * CertOpenSystemStoreW
+ * CertEnumPhysicalStore
+ * CertEnumSystemStore
+ * CertEnumSystemStoreLocation
+ * CertSetStoreProperty
+ * CertUnregisterPhysicalStore
+ * CertUnregisterSystemStore
+ *
  * CertAddCertificateContextToStore
  * CertAddCertificateLinkToStore
  * CertAddCRLContextToStore
@@ -36,20 +54,13 @@
  * CertAddEncodedCRLToStore
  * CertAddEncodedCTLToStore
  * CertAddSerializedElementToStore
- * CertAddStoreToCollection
- * CertControlStore
- * CertCloseStore
  * CertDeleteCertificateFromStore
  * CertDeleteCRLFromStore
  * CertDeleteCTLFromStore
- * CertDuplicateStore
  * CertGetCRLFromStore
  * CertEnumCertificatesInStore
  * CertEnumCRLsInStore
  * CertEnumCTLsInStore
- * CertEnumPhysicalStore
- * CertEnumSystemStore
- * CertEnumSystemStoreLocation
  * CertFindCertificateInStore
  * CertFindChainInStore
  * CertFindCRLInStore
@@ -57,19 +68,9 @@
  * CertGetIssuerCertificateFromStore
  * CertGetStoreProperty
  * CertGetSubjectCertificateFromStore
- * CertOpenStore
- * CertOpenSystemStoreA
- * CertOpenSystemStoreW
- * CertRegisterPhysicalStore
- * CertRegisterSystemStore
- * CertRemoveStoreFromCollection
- * CertSaveStore
  * CertSerializeCertificateStoreElement
  * CertSerializeCRLStoreElement
  * CertSerializeCTLStoreElement
- * CertSetStoreProperty
- * CertUnregisterPhysicalStore
- * CertUnregisterSystemStore
  *
  * CertAddEnhancedKeyUsageIdentifier
  * CertAddRefServerOcspResponse

diff --git a/winpr/libwinpr/sspi/Schannel/schannel.h b/winpr/libwinpr/sspi/Schannel/schannel.h
index aeac6f6..956bba2 100644 (file)
--- a/winpr/libwinpr/sspi/Schannel/schannel.h
+++ b/winpr/libwinpr/sspi/Schannel/schannel.h
@@ -21,6 +21,7 @@
 #define WINPR_SSPI_SCHANNEL_PRIVATE_H
 
 #include <winpr/sspi.h>
+#include <winpr/wtypes.h>
 
 #include "../sspi.h"