From 0d73e2f7a253743a632ada3dd1b638360d697dcc Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Oct 2016 14:11:15 +0200 Subject: [PATCH] Incorrect pEapOutput in method::set_ui_context() methods fixed --- EAPMethods/src/Main.cpp | 10 +++++----- lib/EAPBase/include/Method.h | 2 +- lib/EAPBase/include/Module.h | 2 +- lib/EAPBase/src/Method.cpp | 2 +- lib/TTLS/include/Method.h | 2 +- lib/TTLS/include/Module.h | 2 +- lib/TTLS/src/Method.cpp | 2 +- lib/TTLS/src/Module.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index 6f444a1..e070b1f 100644 --- a/EAPMethods/src/Main.cpp +++ b/EAPMethods/src/Main.cpp @@ -537,11 +537,11 @@ DWORD APIENTRY EapPeerGetUIContext( /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx) /// DWORD APIENTRY EapPeerSetUIContext( - _In_ EAP_SESSION_HANDLE hSession, - _In_ DWORD dwUIContextDataSize, - _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, - _In_ /*const*/ EapPeerMethodOutput *pEapOutput, - _Out_ EAP_ERROR **ppEapError) + _In_ EAP_SESSION_HANDLE hSession, + _In_ DWORD dwUIContextDataSize, + _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, + _Out_ EapPeerMethodOutput *pEapOutput, + _Out_ EAP_ERROR **ppEapError) { DWORD dwResult = ERROR_SUCCESS; event_fn_auto_ret event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult)); diff --git a/lib/EAPBase/include/Method.h b/lib/EAPBase/include/Method.h index 68c2fab..42b60ab 100644 --- a/lib/EAPBase/include/Method.h +++ b/lib/EAPBase/include/Method.h @@ -154,7 +154,7 @@ namespace eap virtual void set_ui_context( _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// @} diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h index 069d1ef..eaf4d47 100644 --- a/lib/EAPBase/include/Module.h +++ b/lib/EAPBase/include/Module.h @@ -762,7 +762,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) = 0; + _Out_ EapPeerMethodOutput *pEapOutput) = 0; /// /// Obtains an array of EAP response attributes from the EAP method. diff --git a/lib/EAPBase/src/Method.cpp b/lib/EAPBase/src/Method.cpp index 99df332..81863d6 100644 --- a/lib/EAPBase/src/Method.cpp +++ b/lib/EAPBase/src/Method.cpp @@ -125,7 +125,7 @@ void eap::method::get_ui_context( void eap::method::set_ui_context( _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { UNREFERENCED_PARAMETER(pUIContextData); UNREFERENCED_PARAMETER(dwUIContextDataSize); diff --git a/lib/TTLS/include/Method.h b/lib/TTLS/include/Method.h index 77bfe1c..0bdc635 100644 --- a/lib/TTLS/include/Method.h +++ b/lib/TTLS/include/Method.h @@ -143,7 +143,7 @@ namespace eap virtual void set_ui_context( _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// @} diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h index 223c085..edcc02a 100644 --- a/lib/TTLS/include/Module.h +++ b/lib/TTLS/include/Module.h @@ -190,7 +190,7 @@ namespace eap _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput); + _Out_ EapPeerMethodOutput *pEapOutput); /// /// Obtains an array of EAP response attributes from the EAP method. diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp index aae5296..bb3bca8 100644 --- a/lib/TTLS/src/Method.cpp +++ b/lib/TTLS/src/Method.cpp @@ -158,7 +158,7 @@ void eap::method_ttls::get_ui_context( void eap::method_ttls::set_ui_context( _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { UNREFERENCED_PARAMETER(pUIContextData); UNREFERENCED_PARAMETER(dwUIContextDataSize); diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index d0e9fc4..cff8e43 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -316,7 +316,7 @@ void eap::peer_ttls::set_ui_context( _In_ EAP_SESSION_HANDLE hSession, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize, - _In_ const EapPeerMethodOutput *pEapOutput) + _Out_ EapPeerMethodOutput *pEapOutput) { static_cast(hSession)->m_method->set_ui_context(pUIContextData, dwUIContextDataSize, pEapOutput); }