From a254dd527aaf3b5486600f70e92790120fb979bb Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 3 Feb 2022 14:09:12 +0100 Subject: [PATCH] Move Base64 from WinStd to stdex Signed-off-by: Simon Rozman --- .gitmodules | 3 +++ CredWrite/CredWrite.vcxproj | 2 +- CredWrite/Main.cpp | 1 + CredWrite/PCH.h | 2 +- EAPMethods/Common.props | 2 +- EventMonitor/EventMonitor.vcxproj | 2 +- WLANManager/WLANManager.vcxproj | 2 +- lib/EAPBase/build/EAPBase.vcxproj | 2 +- lib/EAPBase/include/EAPXML.h | 10 +++++----- lib/EAPBase/src/Credentials.cpp | 4 ++-- lib/EAPBase_UI/build/EAPBase_UI.vcxproj | 2 +- lib/EapHost/build/EapHost.vcxproj | 2 +- lib/EapHost_UI/build/EapHost_UI.vcxproj | 2 +- lib/GTC/build/GTC.vcxproj | 2 +- lib/GTC_UI/build/GTC_UI.vcxproj | 2 +- lib/MSCHAPv2/build/MSCHAPv2.vcxproj | 2 +- lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj | 2 +- lib/PAP/build/PAP.vcxproj | 2 +- lib/PAP_UI/build/PAP_UI.vcxproj | 2 +- lib/TLS/build/TLS.vcxproj | 2 +- lib/TLS_UI/build/TLS_UI.vcxproj | 2 +- lib/TTLS/build/TTLS.vcxproj | 2 +- lib/TTLS_UI/build/TTLS_UI.vcxproj | 2 +- lib/WinStd | 2 +- lib/stdex | 1 + 25 files changed, 32 insertions(+), 27 deletions(-) create mode 160000 lib/stdex diff --git a/.gitmodules b/.gitmodules index 076a32b..6fb6ca0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lib/wxExtend"] path = lib/wxExtend url = https://github.com/Amebis/wxExtend.git +[submodule "lib/stdex"] + path = lib/stdex + url = https://github.com/Amebis/stdex.git diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index 6f0d043..2d9d889 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -58,7 +58,7 @@ - ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories) + ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories) diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp index 900a619..0829f2a 100644 --- a/CredWrite/Main.cpp +++ b/CredWrite/Main.cpp @@ -7,6 +7,7 @@ #include "PCH.h" using namespace std; +using namespace stdex; using namespace winstd; class module_dummy : public eap::module { diff --git a/CredWrite/PCH.h b/CredWrite/PCH.h index 49656ab..aa547b8 100644 --- a/CredWrite/PCH.h +++ b/CredWrite/PCH.h @@ -11,8 +11,8 @@ #include "../lib/EAPBase/include/Module.h" #include -#include #include +#include #include #include // Must include after diff --git a/EAPMethods/Common.props b/EAPMethods/Common.props index e755cfd..34d8f87 100644 --- a/EAPMethods/Common.props +++ b/EAPMethods/Common.props @@ -10,7 +10,7 @@ - $(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories) + $(ProjectDir);..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories) diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj index 667fde9..d87b38b 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -58,7 +58,7 @@ - ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories) + ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;..\lib\wxExtend\include;%(AdditionalIncludeDirectories) RequireAdministrator diff --git a/WLANManager/WLANManager.vcxproj b/WLANManager/WLANManager.vcxproj index 70e791a..c2369ef 100644 --- a/WLANManager/WLANManager.vcxproj +++ b/WLANManager/WLANManager.vcxproj @@ -58,7 +58,7 @@ - ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories) + ..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;..\lib\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/EAPBase/build/EAPBase.vcxproj b/lib/EAPBase/build/EAPBase.vcxproj index 9db3360..9520504 100644 --- a/lib/EAPBase/build/EAPBase.vcxproj +++ b/lib/EAPBase/build/EAPBase.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/EAPBase/include/EAPXML.h b/lib/EAPBase/include/EAPXML.h index ecd20d8..4e77c2a 100644 --- a/lib/EAPBase/include/EAPXML.h +++ b/lib/EAPBase/include/EAPXML.h @@ -544,8 +544,8 @@ namespace eapxml #pragma once -#include #include +#include #include @@ -711,7 +711,7 @@ namespace eapxml winstd::bstr bstr; HRESULT hr = get_element_value(pXmlParent, bstrElementName, bstr, ppXmlElement); if (SUCCEEDED(hr)) { - winstd::base64_dec dec; + stdex::base64_dec dec; bool is_last; dec.decode(aValue, is_last, (BSTR)bstr, bstr.length()); } @@ -866,7 +866,7 @@ namespace eapxml inline HRESULT put_element_base64(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj *ppXmlElement) { std::wstring sBase64; - winstd::base64_enc enc; + stdex::base64_enc enc; enc.encode(sBase64, pValue, nValueLen); return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(sBase64), ppXmlElement); } @@ -945,7 +945,7 @@ namespace eapxml winstd::bstr bstr; HRESULT hr = get_attrib_value(pXmlParent, bstrAttributeName, &bstr); if (SUCCEEDED(hr)) { - winstd::base64_dec dec; + stdex::base64_dec dec; bool is_last; dec.decode(aValue, is_last, (BSTR)bstr, bstr.length()); } @@ -998,7 +998,7 @@ namespace eapxml inline HRESULT put_attrib_base64(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen) { std::wstring sBase64; - winstd::base64_enc enc; + stdex::base64_enc enc; enc.encode(sBase64, pValue, nValueLen); return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(sBase64)); } diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 93ba36e..3e018a7 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -452,7 +452,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot) if (encryption && CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, encryption, encryption.length(), _L(PRODUCT_NAME_STR) _L(" v2"), -1, NULL, NULL, 0) == CSTR_EQUAL) { // Decode Base64. - winstd::base64_dec dec; + stdex::base64_dec dec; bool is_last; vector password_enc; dec.decode(password_enc, is_last, (BSTR)password, password.length()); @@ -466,7 +466,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot) m_enc_alg = enc_alg_t::native; } else if (encryption && CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, encryption, encryption.length(), _L(PRODUCT_NAME_STR), -1, NULL, NULL, 0) == CSTR_EQUAL) { // Decode Base64. - winstd::base64_dec dec; + stdex::base64_dec dec; bool is_last; vector password_enc; dec.decode(password_enc, is_last, (BSTR)password, password.length()); diff --git a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj index 47a9659..55e865d 100644 --- a/lib/EAPBase_UI/build/EAPBase_UI.vcxproj +++ b/lib/EAPBase_UI/build/EAPBase_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) diff --git a/lib/EapHost/build/EapHost.vcxproj b/lib/EapHost/build/EapHost.vcxproj index 7d33f06..83c2b5e 100644 --- a/lib/EapHost/build/EapHost.vcxproj +++ b/lib/EapHost/build/EapHost.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/EapHost_UI/build/EapHost_UI.vcxproj b/lib/EapHost_UI/build/EapHost_UI.vcxproj index 726094b..d96cf78 100644 --- a/lib/EapHost_UI/build/EapHost_UI.vcxproj +++ b/lib/EapHost_UI/build/EapHost_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/GTC/build/GTC.vcxproj b/lib/GTC/build/GTC.vcxproj index 7b10197..dd6afa5 100644 --- a/lib/GTC/build/GTC.vcxproj +++ b/lib/GTC/build/GTC.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/GTC_UI/build/GTC_UI.vcxproj b/lib/GTC_UI/build/GTC_UI.vcxproj index cf78cfd..e6e8cd1 100644 --- a/lib/GTC_UI/build/GTC_UI.vcxproj +++ b/lib/GTC_UI/build/GTC_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj index 05ae94a..1114b5f 100644 --- a/lib/MSCHAPv2/build/MSCHAPv2.vcxproj +++ b/lib/MSCHAPv2/build/MSCHAPv2.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj index 9e94ff5..ca9b6cb 100644 --- a/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj +++ b/lib/MSCHAPv2_UI/build/MSCHAPv2_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/PAP/build/PAP.vcxproj b/lib/PAP/build/PAP.vcxproj index 31a250d..c4c59ae 100644 --- a/lib/PAP/build/PAP.vcxproj +++ b/lib/PAP/build/PAP.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/PAP_UI/build/PAP_UI.vcxproj b/lib/PAP_UI/build/PAP_UI.vcxproj index 5791e5c..407684b 100644 --- a/lib/PAP_UI/build/PAP_UI.vcxproj +++ b/lib/PAP_UI/build/PAP_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/TLS/build/TLS.vcxproj b/lib/TLS/build/TLS.vcxproj index a291895..eefb536 100644 --- a/lib/TLS/build/TLS.vcxproj +++ b/lib/TLS/build/TLS.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/TLS_UI/build/TLS_UI.vcxproj b/lib/TLS_UI/build/TLS_UI.vcxproj index 34b7a6c..65496be 100644 --- a/lib/TLS_UI/build/TLS_UI.vcxproj +++ b/lib/TLS_UI/build/TLS_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;..\..\wxExtend\include;%(AdditionalIncludeDirectories) diff --git a/lib/TTLS/build/TTLS.vcxproj b/lib/TTLS/build/TTLS.vcxproj index 276f10c..04f3e6f 100644 --- a/lib/TTLS/build/TTLS.vcxproj +++ b/lib/TTLS/build/TTLS.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/TTLS_UI/build/TTLS_UI.vcxproj b/lib/TTLS_UI/build/TTLS_UI.vcxproj index 1cfee89..42d02b0 100644 --- a/lib/TTLS_UI/build/TTLS_UI.vcxproj +++ b/lib/TTLS_UI/build/TTLS_UI.vcxproj @@ -58,7 +58,7 @@ - ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories) + ..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;..\..\stdex\include;%(AdditionalIncludeDirectories) diff --git a/lib/WinStd b/lib/WinStd index c49ea10..880fd34 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit c49ea100550a64b92857e7792bdd472514b9c162 +Subproject commit 880fd34e16d7f6624b7aab64b29a958c6a7ab388 diff --git a/lib/stdex b/lib/stdex new file mode 160000 index 0000000..4521ea8 --- /dev/null +++ b/lib/stdex @@ -0,0 +1 @@ +Subproject commit 4521ea8f00379099888884bc8aa3c7a3894d6b9f