Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

WinStd, stdex, wxExtend: Update

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-11-19 10:18:07 +01:00
parent 0f3070033f
commit 2a918254f6
18 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CredWrite/PCH.h
View File

@ -12,7 +12,7 @@
#include <WinStd/Common.h>
#include <WinStd/Win.h>
#include <stdex/base64.h>
#include <stdex/base64.hpp>
#include <Windows.h>
#include <eaptypes.h> // Must include after <Windows.h>

4
EventMonitor/ETWLog.h
View File

@ -31,7 +31,7 @@ class wxPersistentETWListCtrl;
#include <wx/persist/window.h>
#include <wx/thread.h>
#include <stdex/vector_queue.h>
#include <stdex/vector_queue.hpp>
#include <WinStd/ETW.h>
#include <memory>
@ -155,7 +155,7 @@ protected:
///
/// Functor for GUID comparison
///
struct less_guid : public std::binary_function<GUID, GUID, bool>
struct less_guid
{
///
/// Compares two GUIDs

1
include/Common.props
View File

@ -29,6 +29,7 @@
<StringPooling>true</StringPooling>
<EnablePREfast>true</EnablePREfast>
<DisableSpecificWarnings>26812</DisableSpecificWarnings>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>

4
lib/EAPBase/include/EAPXML.h
View File

@ -544,8 +544,8 @@ namespace eapxml
#pragma once
#include <stdex/hex.h>
#include <stdex/base64.h>
#include <stdex/hex.hpp>
#include <stdex/base64.hpp>
#include <assert.h>

4
lib/EapHost/src/Config.cpp
View File

@ -77,7 +77,7 @@ void eap::config_method_eaphost::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNo
// Convert configuration BLOB to XML using EapHost (and ultimately method peer's EapPeerConfigBlob2Xml).
com_obj<IXMLDOMDocument2> pConfigDoc;
eap_error error;
DWORD dwResult = EapHostPeerConfigBlob2Xml(0, m_type, (DWORD)m_cfg_blob.size(), const_cast<BYTE*>(m_cfg_blob.data()), &pConfigDoc, get_ptr(error));
DWORD dwResult = EapHostPeerConfigBlob2Xml(0, m_type, (DWORD)m_cfg_blob.size(), const_cast<BYTE*>(m_cfg_blob.data()), &pConfigDoc, stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
HRESULT hr;
@ -108,7 +108,7 @@ void eap::config_method_eaphost::load(_In_ IXMLDOMNode *pConfigRoot)
DWORD cfg_data_size = 0;
eap_blob cfg_data;
eap_error error;
DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, get_ptr(cfg_data), &m_type, get_ptr(error));
DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, stdex::get_ptr(cfg_data), &m_type, stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
LPCBYTE _cfg_data = cfg_data.get();
m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size);

6
lib/EapHost/src/Credentials.cpp
View File

@ -265,9 +265,9 @@ eap::credentials::source_t eap::credentials_eaphost::combine(
src != source_t::unknown ? (DWORD)m_cred_blob.size() : 0, src != source_t::unknown ? m_cred_blob.data() : NULL,
NULL,
&fInvokeUI,
&cred_data_size, get_ptr(cred_data),
get_ptr(identity),
get_ptr(error),
&cred_data_size, stdex::get_ptr(cred_data),
stdex::get_ptr(identity),
stdex::get_ptr(error),
NULL);
if (dwResult == ERROR_SUCCESS) {
if (identity && !fInvokeUI) {

18
lib/EapHost/src/Method.cpp
View File

@ -50,7 +50,7 @@ void eap::method_eaphost::begin_session(
dwMaxSendPacketSize,
NULL, NULL, NULL,
&m_session_id,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Session succesfully created.
} else if (error)
@ -64,7 +64,7 @@ void eap::method_eaphost::end_session()
{
// End EapHost peer session.
eap_error_runtime error;
DWORD dwResult = EapHostPeerEndSession(m_session_id, get_ptr(error));
DWORD dwResult = EapHostPeerEndSession(m_session_id, stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Session successfuly ended.
} else if (error)
@ -90,7 +90,7 @@ EapPeerMethodResponseAction eap::method_eaphost::process_request_packet(
dwReceivedPacketSize,
reinterpret_cast<const BYTE*>(pReceivedPacket),
&action,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Packet successfuly processed.
return action_h2p(action);
@ -112,7 +112,7 @@ void eap::method_eaphost::get_response_packet(
m_session_id,
&size_max,
&_packet,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Packet successfuly prepared.
packet.assign(_packet, _packet + size_max);
@ -134,7 +134,7 @@ void eap::method_eaphost::get_result(
m_session_id,
EapHostPeerMethodResultFromMethod,
&result,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Result successfuly returned.
method::get_result(reason, pResult);
@ -181,7 +181,7 @@ void eap::method_eaphost::get_ui_context(_Out_ sanitizing_blob &context_data)
m_session_id,
&dwUIContextDataSize,
&pUIContextData,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// UI context data successfuly returned.
context_data.assign(pUIContextData, pUIContextData + dwUIContextDataSize);
@ -207,7 +207,7 @@ EapPeerMethodResponseAction eap::method_eaphost::set_ui_context(
dwUIContextDataSize,
pUIContextData,
&action,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// UI context data successfuly returned.
return action_h2p(action);
@ -225,7 +225,7 @@ void eap::method_eaphost::get_response_attributes(_Out_ EapAttributes *pAttribs)
DWORD dwResult = EapHostPeerGetResponseAttributes(
m_session_id,
pAttribs,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Response attributes successfuly returned.
} else if (error)
@ -244,7 +244,7 @@ EapPeerMethodResponseAction eap::method_eaphost::set_response_attributes(_In_ co
m_session_id,
pAttribs,
&action,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Response attributes successfuly set.
return action_h2p(action);

1
lib/EapHost/src/PCH.h
View File

@ -12,6 +12,7 @@
#include "../../EAPBase/include/Module.h"
#include <stdex/memory.hpp>
#include <WinStd/Cred.h>
#include <WinStd/Win.h>

4
lib/EapHost_UI/src/EapHost_UI.cpp
View File

@ -37,7 +37,7 @@ wxEapHostMethodConfigPanel::wxEapHostMethodConfigPanel(const eap::config_provide
winstd::eap_method_info_array methods;
winstd::eap_error error;
DWORD dwResult = EapHostPeerGetMethods(&methods, get_ptr(error));
DWORD dwResult = EapHostPeerGetMethods(&methods, stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
for (DWORD i = 0; i < methods.dwNumberOfMethods; i++)
m_method->Append(methods.pEapMethods[i].pwszFriendlyName, new wxEAPMethodTypeClientData(methods.pEapMethods[i].eaptype, methods.pEapMethods[i].eapProperties));
@ -112,7 +112,7 @@ void wxEapHostMethodConfigPanel::OnSettings(wxCommandEvent& event)
DWORD cfg_data_size = 0;
winstd::eap_blob cfg_data;
winstd::eap_error error;
DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, get_ptr(cfg_data), get_ptr(error));
DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, stdex::get_ptr(cfg_data), stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
LPCBYTE _cfg_data = cfg_data.get();
data->m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size);

1
lib/EapHost_UI/src/PCH.h
View File

@ -8,6 +8,7 @@
#include "../include/EapHost_UI.h"
#include <stdex/memory.hpp>
#include <WinStd/EAP.h>
#include <eaphostpeerconfigapis.h>

2
lib/GTC/src/PCH.h
View File

@ -11,7 +11,7 @@
#include "../../EAPBase/include/Module.h"
#include <stdex/hex.h>
#include <stdex/hex.hpp>
#include <Windows.h>
#include <EapHostError.h> // include after Windows.h

2
lib/MSCHAPv2/src/PCH.h
View File

@ -12,7 +12,7 @@
#include "../../EAPBase/include/Module.h"
#include <stdex/hex.h>
#include <stdex/hex.hpp>
#include <Windows.h>
#include <EapHostError.h> // include after Windows.h

1
lib/TTLS/src/Method.cpp
View File

@ -83,6 +83,7 @@ EapPeerMethodResponseAction eap::method_eapmsg::process_request_packet(
break;
}
// Do not break out of this case to allow continuing with the following case, checking there is no second mandatory EAP-Message present.
[[fallthrough]];
default:
if (hdr->flags & diameter_avp_flag_mandatory)

8
lib/TTLS_UI/src/Module.cpp
View File

@ -215,9 +215,9 @@ void eap::peer_peap_ui::invoke_identity_ui(
hwndParent,
(DWORD)cfg_inner_eaphost->m_cfg_blob.size(), cfg_inner_eaphost->m_cfg_blob.data(),
(DWORD)cred_inner->m_cred_blob.size(), cred_inner->m_cred_blob.data(),
&cred_data_size, get_ptr(cred_data),
get_ptr(identity),
get_ptr(error),
&cred_data_size, stdex::get_ptr(cred_data),
stdex::get_ptr(identity),
stdex::get_ptr(error),
NULL);
if (dwResult == ERROR_SUCCESS) {
// Inner EAP method provided credentials.
@ -330,7 +330,7 @@ void eap::peer_peap_ui::invoke_interactive_ui(
ctx.m_data.data(),
&dwSizeofDataFromInteractiveUI,
&pDataFromInteractiveUI,
get_ptr(error));
stdex::get_ptr(error));
if (dwResult == ERROR_SUCCESS) {
// Inner EAP method provided response.
ctx.m_data.assign(pDataFromInteractiveUI, pDataFromInteractiveUI + dwSizeofDataFromInteractiveUI);

2
lib/TTLS_UI/src/PCH.h
View File

@ -20,4 +20,6 @@
#include "../../EapHost/include/Credentials.h"
#include "../../EapBase/include/UIContext.h"
#include <stdex/memory.hpp>
#include <wx/choicdlg.h>

2
lib/WinStd

@ -1 +1 @@
Subproject commit 9ff26e14227c1c9243e882e49d5960b215cc9603
Subproject commit f85047dab9f000b625864eb930e11f650831ef7c

2
lib/stdex

@ -1 +1 @@
Subproject commit ff8ca7f073a34e4e2e7829e914e1db43271a15c4
Subproject commit 246f2baa1e3a7964f173469da3fd16e8336094cc

2
lib/wxExtend

@ -1 +1 @@
Subproject commit e3a59d1118053ed48dc15b83d17125da87c434dd
Subproject commit 79ec08365068ab6e03b06caef13de0ce6b06fcd5