Incorrect pEapOutput in method::set_ui_context() methods fixed

# Conflicts:
#	lib/EAPBase/include/Method.h
#	lib/EAPBase/src/Method.cpp
#	lib/TTLS/include/Method.h
#	lib/TTLS/src/Method.cpp
This commit is contained in:
Simon Rozman 2016-10-24 14:11:15 +02:00
parent 1ccf97b6d7
commit 4722c42903
4 changed files with 8 additions and 8 deletions

View File

@ -537,11 +537,11 @@ DWORD APIENTRY EapPeerGetUIContext(
/// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx) /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
/// ///
DWORD APIENTRY EapPeerSetUIContext( DWORD APIENTRY EapPeerSetUIContext(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_ DWORD dwUIContextDataSize, _In_ DWORD dwUIContextDataSize,
_In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData,
_In_ /*const*/ EapPeerMethodOutput *pEapOutput, _Out_ EapPeerMethodOutput *pEapOutput,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
DWORD dwResult = ERROR_SUCCESS; DWORD dwResult = ERROR_SUCCESS;
event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult)); event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));

View File

@ -762,7 +762,7 @@ namespace eap
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData,
_In_ DWORD dwUIContextDataSize, _In_ DWORD dwUIContextDataSize,
_In_ const EapPeerMethodOutput *pEapOutput) = 0; _Out_ EapPeerMethodOutput *pEapOutput) = 0;
/// ///
/// Obtains an array of EAP response attributes from the EAP method. /// Obtains an array of EAP response attributes from the EAP method.

View File

@ -190,7 +190,7 @@ namespace eap
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData,
_In_ DWORD dwUIContextDataSize, _In_ DWORD dwUIContextDataSize,
_In_ const EapPeerMethodOutput *pEapOutput); _Out_ EapPeerMethodOutput *pEapOutput);
/// ///
/// Obtains an array of EAP response attributes from the EAP method. /// Obtains an array of EAP response attributes from the EAP method.

View File

@ -311,7 +311,7 @@ void eap::peer_ttls::set_ui_context(
_In_ EAP_SESSION_HANDLE hSession, _In_ EAP_SESSION_HANDLE hSession,
_In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_count_(dwUIContextDataSize) const BYTE *pUIContextData,
_In_ DWORD dwUIContextDataSize, _In_ DWORD dwUIContextDataSize,
_In_ const EapPeerMethodOutput *pEapOutput) _Out_ EapPeerMethodOutput *pEapOutput)
{ {
UNREFERENCED_PARAMETER(hSession); UNREFERENCED_PARAMETER(hSession);
UNREFERENCED_PARAMETER(pUIContextData); UNREFERENCED_PARAMETER(pUIContextData);