| cryptuiapi.h (6.3.9600.17415-Windows 8.1) | | cryptuiapi.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 45 | | skipping to change at line 45 |
|---|
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // Dialog viewer of a certificate, CTL or CRL context. | | // Dialog viewer of a certificate, CTL or CRL context. |
| // | | // |
| // dwContextType and associated pvContext's | | // dwContextType and associated pvContext's |
| // CERT_STORE_CERTIFICATE_CONTEXT PCCERT_CONTEXT | | // CERT_STORE_CERTIFICATE_CONTEXT PCCERT_CONTEXT |
| // CERT_STORE_CRL_CONTEXT PCCRL_CONTEXT | | // CERT_STORE_CRL_CONTEXT PCCRL_CONTEXT |
| // CERT_STORE_CTL_CONTEXT PCCTL_CONTEXT | | // CERT_STORE_CTL_CONTEXT PCCTL_CONTEXT |
| // | | // |
| // dwFlags currently isn't used and should be set to 0. | | // dwFlags currently isn't used and should be set to 0. |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIDlgViewContext( | | CryptUIDlgViewContext( |
|
| IN DWORD dwContextType, | | _In_ DWORD dwContextType, |
| IN const void *pvContext, | | _In_ const void *pvContext, |
| IN OPTIONAL HWND hwnd, // Defaults to the desktop window | | _In_opt_ HWND hwnd, // Defaults to the desktop window |
| IN OPTIONAL LPCWSTR pwszTitle, // Defaults to the context type title | | _In_opt_ LPCWSTR pwszTitle, // Defaults to the context type title |
| IN DWORD dwFlags, | | _In_ DWORD dwFlags, |
| IN void *pvReserved | | _In_ void *pvReserved |
| ); | | ); |
| | |
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // Dialog to select a certificate from the specified store. | | // Dialog to select a certificate from the specified store. |
| // | | // |
| // Returns the selected certificate context. If no certificate was | | // Returns the selected certificate context. If no certificate was |
| // selected, NULL is returned. | | // selected, NULL is returned. |
| // | | // |
| // pwszTitle is either NULL or the title to be used for the dialog. | | // pwszTitle is either NULL or the title to be used for the dialog. |
| // If NULL, the default title is used. The default title is | | // If NULL, the default title is used. The default title is |
| | |
| skipping to change at line 78 | | skipping to change at line 79 |
|---|
| // "Select a certificate you wish to use" is used in the dialog. | | // "Select a certificate you wish to use" is used in the dialog. |
| // | | // |
| // dwDontUseColumn can be set to exclude columns from the selection | | // dwDontUseColumn can be set to exclude columns from the selection |
| // dialog. See the CRYPTDLG_SELECTCERT_*_COLUMN definitions below. | | // dialog. See the CRYPTDLG_SELECTCERT_*_COLUMN definitions below. |
| // | | // |
| // dwFlags currently isn't used and should be set to 0. | | // dwFlags currently isn't used and should be set to 0. |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| PCCERT_CONTEXT | | PCCERT_CONTEXT |
| WINAPI | | WINAPI |
| CryptUIDlgSelectCertificateFromStore( | | CryptUIDlgSelectCertificateFromStore( |
|
| IN HCERTSTORE hCertStore, | | _In_ HCERTSTORE hCertStore, |
| IN OPTIONAL HWND hwnd, // Defaults to the desktop window | | _In_opt_ HWND hwnd, // Defaults to the desktop window |
| IN OPTIONAL LPCWSTR pwszTitle, | | _In_opt_ LPCWSTR pwszTitle, |
| IN OPTIONAL LPCWSTR pwszDisplayString, | | _In_opt_ LPCWSTR pwszDisplayString, |
| IN DWORD dwDontUseColumn, | | _In_ DWORD dwDontUseColumn, |
| IN DWORD dwFlags, | | _In_ DWORD dwFlags, |
| IN void *pvReserved | | _In_ void *pvReserved |
| ); | | ); |
| | |
| // flags for dwDontUseColumn | | // flags for dwDontUseColumn |
| #define CRYPTUI_SELECT_ISSUEDTO_COLUMN 0x000000001 | | #define CRYPTUI_SELECT_ISSUEDTO_COLUMN 0x000000001 |
| #define CRYPTUI_SELECT_ISSUEDBY_COLUMN 0x000000002 | | #define CRYPTUI_SELECT_ISSUEDBY_COLUMN 0x000000002 |
| #define CRYPTUI_SELECT_INTENDEDUSE_COLUMN 0x000000004 | | #define CRYPTUI_SELECT_INTENDEDUSE_COLUMN 0x000000004 |
| #define CRYPTUI_SELECT_FRIENDLYNAME_COLUMN 0x000000008 | | #define CRYPTUI_SELECT_FRIENDLYNAME_COLUMN 0x000000008 |
| #define CRYPTUI_SELECT_LOCATION_COLUMN 0x000000010 | | #define CRYPTUI_SELECT_LOCATION_COLUMN 0x000000010 |
| #define CRYPTUI_SELECT_EXPIRATION_COLUMN 0x000000020 | | #define CRYPTUI_SELECT_EXPIRATION_COLUMN 0x000000020 |
| | |
| | |
| skipping to change at line 129 | | skipping to change at line 130 |
|---|
| // | | // |
| // CertSelectionGetSerializedBlob | | // CertSelectionGetSerializedBlob |
| // | | // |
| // The API to obtain serialized blob from an input struct | | // The API to obtain serialized blob from an input struct |
| // | | // |
| // | | // |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| HRESULT | | HRESULT |
| WINAPI | | WINAPI |
| CertSelectionGetSerializedBlob( | | CertSelectionGetSerializedBlob( |
|
| IN PCERT_SELECTUI_INPUT pcsi, | | _In_ PCERT_SELECTUI_INPUT pcsi, |
| OUT void ** ppOutBuffer, | | _Outptr_result_maybenull_ void ** ppOutBuffer, |
| OUT ULONG *pulOutBufferSize); | | _Out_ ULONG *pulOutBufferSize); |
| | |
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // Valid values for dwFlags in CRYPTUI_CERT_MGR_STRUCT struct. | | // Valid values for dwFlags in CRYPTUI_CERT_MGR_STRUCT struct. |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| #define CRYPTUI_CERT_MGR_TAB_MASK 0x0000000F | | #define CRYPTUI_CERT_MGR_TAB_MASK 0x0000000F |
| #define CRYPTUI_CERT_MGR_PUBLISHER_TAB 0x00000004 | | #define CRYPTUI_CERT_MGR_PUBLISHER_TAB 0x00000004 |
| #define CRYPTUI_CERT_MGR_SINGLE_TAB_FLAG 0x00008000 | | #define CRYPTUI_CERT_MGR_SINGLE_TAB_FLAG 0x00008000 |
| | |
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // | | // |
| | |
| skipping to change at line 191 | | skipping to change at line 192 |
|---|
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // | | // |
| // CryptUIDlgCertMgr | | // CryptUIDlgCertMgr |
| // | | // |
| // The wizard to manage certificates in store. | | // The wizard to manage certificates in store. |
| // | | // |
| // pCryptUICertMgr IN Required: Poitner to CRYPTUI_CERT_MGR_STRUCT | | // pCryptUICertMgr IN Required: Poitner to CRYPTUI_CERT_MGR_STRUCT |
| // structure. | | // structure. |
| // | | // |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIDlgCertMgr( | | CryptUIDlgCertMgr( |
|
| IN PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr | | _In_ PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr |
| ); | | ); |
| | |
| //+---------------------------------------------------------------------------- | | //+---------------------------------------------------------------------------- |
| // | | // |
| // CRYPTUI_WIZ_DIGITAL_SIGN_BLOB_INFO | | // CRYPTUI_WIZ_DIGITAL_SIGN_BLOB_INFO |
| // | | // |
| // dwSize IN Required: Should be set to | | // dwSize IN Required: Should be set to |
| // sizeof(CRYPTUI_WIZ_DIGITAL_SIGN_BLOB_INFO) | | // sizeof(CRYPTUI_WIZ_DIGITAL_SIGN_BLOB_INFO) |
| // | | // |
| // pGuidSubject IN Required: Idenfity the sip functions to load | | // pGuidSubject IN Required: Idenfity the sip functions to load |
| | |
| skipping to change at line 540 | | skipping to change at line 542 |
|---|
| // hwndParent IN Optional: The parent window handle. | | // hwndParent IN Optional: The parent window handle. |
| // | | // |
| // pwszWizardTitle IN Optional: The title of the wizard. | | // pwszWizardTitle IN Optional: The title of the wizard. |
| // | | // |
| // pDigitalSignInfo IN Required: The information about the signing process. | | // pDigitalSignInfo IN Required: The information about the signing process. |
| // | | // |
| // ppSignContext OUT Optional: The context pointer points to the signed | | // ppSignContext OUT Optional: The context pointer points to the signed |
| // blob. | | // blob. |
| // | | // |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIWizDigitalSign( | | CryptUIWizDigitalSign( |
|
| IN DWORD dwFlags, | | _In_ DWORD dwFlags, |
| IN OPTIONAL HWND hwndParent, | | _In_opt_ HWND hwndParent, |
| IN OPTIONAL LPCWSTR pwszWizardTitle, | | _In_opt_ LPCWSTR pwszWizardTitle, |
| IN PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, | | _In_ PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, |
| OUT OPTIONAL PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext | | _Outptr_opt_ PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext |
| ); | | ); |
| | |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIWizFreeDigitalSignContext( | | CryptUIWizFreeDigitalSignContext( |
|
| IN PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext | | _In_ PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext |
| ); | | ); |
| | |
| ////////////////////////////////////////////////////////////////////////////////
///////////////////// | | ////////////////////////////////////////////////////////////////////////////////
///////////////////// |
| // | | // |
| // dwSize size of this struct | | // dwSize size of this struct |
| // hwndParent parent of this dialog
(OPTIONAL) | | // hwndParent parent of this dialog
(OPTIONAL) |
| // dwFlags flags, may a combination of any of the flags
below (OPTIONAL) | | // dwFlags flags, may a combination of any of the flags
below (OPTIONAL) |
| // szTitle title for the window
(OPTIONAL) | | // szTitle title for the window
(OPTIONAL) |
| // pCertContext the cert context that is to be displayed | | // pCertContext the cert context that is to be displayed |
| // rgszPurposes array of purposes that this cert is to be val
idated for (OPTIONAL) | | // rgszPurposes array of purposes that this cert is to be val
idated for (OPTIONAL) |
| | |
| skipping to change at line 701 | | skipping to change at line 705 |
|---|
| LPCPROPSHEETPAGEA rgPropSheetPages; // OPTIONAL | | LPCPROPSHEETPAGEA rgPropSheetPages; // OPTIONAL |
| DWORD nStartPage; | | DWORD nStartPage; |
| } CRYPTUI_VIEWCERTIFICATE_STRUCTA, *PCRYPTUI_VIEWCERTIFICATE_STRUCTA; | | } CRYPTUI_VIEWCERTIFICATE_STRUCTA, *PCRYPTUI_VIEWCERTIFICATE_STRUCTA; |
| typedef const CRYPTUI_VIEWCERTIFICATE_STRUCTA *PCCRYPTUI_VIEWCERTIFICATE_STRUCTA
; | | typedef const CRYPTUI_VIEWCERTIFICATE_STRUCTA *PCCRYPTUI_VIEWCERTIFICATE_STRUCTA
; |
| | |
| // | | // |
| // pfPropertiesChanged this will be set by the dialog proc to inform
the caller | | // pfPropertiesChanged this will be set by the dialog proc to inform
the caller |
| // if any properties have been changed on certs
in the chain | | // if any properties have been changed on certs
in the chain |
| // while the dialog was open | | // while the dialog was open |
| // | | // |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIDlgViewCertificateW( | | CryptUIDlgViewCertificateW( |
|
| IN PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, | | _In_ PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, |
| OUT BOOL *pfPropertiesChanged // OPTIONA | | _Out_ BOOL *pfPropertiesChanged // OPTIO |
| L | | NAL |
| ); | | ); |
| | |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIDlgViewCertificateA( | | CryptUIDlgViewCertificateA( |
|
| IN PCCRYPTUI_VIEWCERTIFICATE_STRUCTA pCertViewInfo, | | _In_ PCCRYPTUI_VIEWCERTIFICATE_STRUCTA pCertViewInfo, |
| OUT BOOL *pfPropertiesChanged // OPTIONA | | _Out_ BOOL *pfPropertiesChanged // OPTIO |
| L | | NAL |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define CryptUIDlgViewCertificate CryptUIDlgViewCertificateW | | #define CryptUIDlgViewCertificate CryptUIDlgViewCertificateW |
| #define PCRYPTUI_VIEWCERTIFICATE_STRUCT PCRYPTUI_VIEWCERTIFICATE_STRUCTW | | #define PCRYPTUI_VIEWCERTIFICATE_STRUCT PCRYPTUI_VIEWCERTIFICATE_STRUCTW |
| #define CRYPTUI_VIEWCERTIFICATE_STRUCT CRYPTUI_VIEWCERTIFICATE_STRUCTW | | #define CRYPTUI_VIEWCERTIFICATE_STRUCT CRYPTUI_VIEWCERTIFICATE_STRUCTW |
| #define PCCRYPTUI_VIEWCERTIFICATE_STRUCT PCCRYPTUI_VIEWCERTIFICATE_STRUCTW | | #define PCCRYPTUI_VIEWCERTIFICATE_STRUCT PCCRYPTUI_VIEWCERTIFICATE_STRUCTW |
| #else | | #else |
| #define CryptUIDlgViewCertificate CryptUIDlgViewCertificateA | | #define CryptUIDlgViewCertificate CryptUIDlgViewCertificateA |
| #define PCRYPTUI_VIEWCERTIFICATE_STRUCT PCRYPTUI_VIEWCERTIFICATE_STRUCTA | | #define PCRYPTUI_VIEWCERTIFICATE_STRUCT PCRYPTUI_VIEWCERTIFICATE_STRUCTA |
| | |
| skipping to change at line 852 | | skipping to change at line 858 |
|---|
| // | | // |
| // If CRYPTUI_WIZ_NO_UI is not set in dwFlags: | | // If CRYPTUI_WIZ_NO_UI is not set in dwFlags: |
| // hwndPrarent: IN Optional: The parent window for the wizard | | // hwndPrarent: IN Optional: The parent window for the wizard |
| // pwszWizardTitle: IN Optional: The title of the wizard | | // pwszWizardTitle: IN Optional: The title of the wizard |
| // If NULL, the default will be IDS_EXP
ORT_WIZARD_TITLE | | // If NULL, the default will be IDS_EXP
ORT_WIZARD_TITLE |
| // pExportInfo: IN Required: The subject to export. | | // pExportInfo: IN Required: The subject to export. |
| // pvoid: IN Optional: Contains information about how to do
the export based on what | | // pvoid: IN Optional: Contains information about how to do
the export based on what |
| // is being exported. See above table
for values, if this is non-NULL | | // is being exported. See above table
for values, if this is non-NULL |
| // the values are displayed to the user
as the default choices. | | // the values are displayed to the user
as the default choices. |
| //------------------------------------------------------------------------ | | //------------------------------------------------------------------------ |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIWizExport( | | CryptUIWizExport( |
|
| DWORD dwFlags, | | _In_ DWORD dwFlags, |
| HWND hwndParent, | | _In_opt_ HWND hwndParent, |
| LPCWSTR pwszWizardTitle, | | _In_opt_ LPCWSTR pwszWizardTitle, |
| PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, | | _In_ PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, |
| void *pvoid | | _In_opt_ void *pvoid |
| ); | | ); |
| | |
| //------------------------------------------------------------------------- | | //------------------------------------------------------------------------- |
| // | | // |
| // Valid values for dwSubjectChoice in IMPORT_SUBJECT_INFO | | // Valid values for dwSubjectChoice in IMPORT_SUBJECT_INFO |
| //------------------------------------------------------------------------- | | //------------------------------------------------------------------------- |
| #define CRYPTUI_WIZ_IMPORT_SUBJECT_FILE 1 | | #define CRYPTUI_WIZ_IMPORT_SUBJECT_FILE 1 |
| #define CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT 2 | | #define CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT 2 |
| #define CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT 3 | | #define CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT 3 |
| #define CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT 4 | | #define CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT 4 |
| | |
| skipping to change at line 986 | | skipping to change at line 993 |
|---|
| // hwndPrarent: IN Optional: The parent window for the wizard | | // hwndPrarent: IN Optional: The parent window for the wizard |
| // pwszWizardTitle: IN Optional: The title of the wizard | | // pwszWizardTitle: IN Optional: The title of the wizard |
| // If NULL, the default will be IDS_IMP
ORT_WIZARD_TITLE | | // If NULL, the default will be IDS_IMP
ORT_WIZARD_TITLE |
| // pImportSubject: IN Optional: The file name to import. | | // pImportSubject: IN Optional: The file name to import. |
| // If NULL, the wizard will prompt user
to enter the file name | | // If NULL, the wizard will prompt user
to enter the file name |
| // hDesCertStore: IN Optional: The destination certificate store wh
ere the file wil be | | // hDesCertStore: IN Optional: The destination certificate store wh
ere the file wil be |
| // imported to. The store should be op
ened with | | // imported to. The store should be op
ened with |
| // flag CERT_STORE_SET_LOCALIZED_NAME_F
LAG. If NULL, the wizard will prompt user to select | | // flag CERT_STORE_SET_LOCALIZED_NAME_F
LAG. If NULL, the wizard will prompt user to select |
| // a certificate store. | | // a certificate store. |
| //------------------------------------------------------------------------ | | //------------------------------------------------------------------------ |
|
| | _Success_(return == TRUE) |
| BOOL | | BOOL |
| WINAPI | | WINAPI |
| CryptUIWizImport( | | CryptUIWizImport( |
|
| DWORD dwFlags, | | _In_ DWORD dwFlags, |
| HWND hwndParent, | | _In_opt_ HWND hwndParent, |
| LPCWSTR pwszWizardTitle, | | _In_opt_ LPCWSTR pwszWizardTitle, |
| PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, | | _In_opt_ PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, |
| HCERTSTORE hDestCertStore | | _In_opt_ HCERTSTORE hDestCertStore |
| ); | | ); |
| | |
| #include <poppack.h> | | #include <poppack.h> |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } // Balance extern "C" above | | } // Balance extern "C" above |
| #endif | | #endif |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| End of changes. 18 change blocks. |
|---|
| 39 lines changed or deleted | | 47 lines changed or added |
|---|
|