From f05d3f8243513552f6e798f89bf8a8784e8f2ec1 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 9 Jan 2020 10:54:06 +0100 Subject: [PATCH] Make _UI suffix consistent Signed-off-by: Simon Rozman --- EAPMethods/MSIBuild/Makefile | Bin 34302 -> 34464 bytes .../{EAPMethodUI.def => EAPMethod_UI.def} | Bin .../{EAPMethodUI.props => EAPMethod_UI.props} | 4 +- .../{EAPTTLSUI.vcxproj => EAPTTLS_UI.vcxproj} | 14 +++--- ...roj.filters => EAPTTLS_UI.vcxproj.filters} | 10 ++--- .../res/{EAPTTLSUI.rc => EAPTTLS_UI.rc} | Bin 5998 -> 6000 bytes EAPMethods/src/{MainUI.cpp => Main_UI.cpp} | 2 +- .../src/{StdAfxUI.cpp => StdAfx_UI.cpp} | 42 +++++++++--------- EAPMethods/src/{StdAfxUI.h => StdAfx_UI.h} | 0 GEANTLink.sln | 2 +- MakefileEAPMethod.mak | Bin 5392 -> 5394 bytes MakefilePlatCfg.mak | Bin 30796 -> 30800 bytes README.md | 2 +- lib/TTLS_UI/src/Module.cpp | 2 +- output/locale/.gitignore | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) rename EAPMethods/build/{EAPMethodUI.def => EAPMethod_UI.def} (100%) rename EAPMethods/build/{EAPMethodUI.props => EAPMethod_UI.props} (75%) rename EAPMethods/build/{EAPTTLSUI.vcxproj => EAPTTLS_UI.vcxproj} (94%) rename EAPMethods/build/{EAPTTLSUI.vcxproj.filters => EAPTTLS_UI.vcxproj.filters} (93%) rename EAPMethods/res/{EAPTTLSUI.rc => EAPTTLS_UI.rc} (99%) rename EAPMethods/src/{MainUI.cpp => Main_UI.cpp} (97%) rename EAPMethods/src/{StdAfxUI.cpp => StdAfx_UI.cpp} (94%) rename EAPMethods/src/{StdAfxUI.h => StdAfx_UI.h} (100%) diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index dd01abd5cb89883cdd866388c24593ebb179d2d8..91dca247d43b01aa782f8a37d8b4f4b8d853b195 100644 GIT binary patch delta 3703 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 Pc7AeTQRmv(2mSv6{+nQI diff --git a/EAPMethods/build/EAPMethodUI.def b/EAPMethods/build/EAPMethod_UI.def similarity index 100% rename from EAPMethods/build/EAPMethodUI.def rename to EAPMethods/build/EAPMethod_UI.def diff --git a/EAPMethods/build/EAPMethodUI.props b/EAPMethods/build/EAPMethod_UI.props similarity index 75% rename from EAPMethods/build/EAPMethodUI.props rename to EAPMethods/build/EAPMethod_UI.props index 03620bd..afbdc91 100644 --- a/EAPMethods/build/EAPMethodUI.props +++ b/EAPMethods/build/EAPMethod_UI.props @@ -7,10 +7,10 @@ - StdAfxUI.h + StdAfx_UI.h - EAPMethodUI.def + EAPMethod_UI.def diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj b/EAPMethods/build/EAPTTLS_UI.vcxproj similarity index 94% rename from EAPMethods/build/EAPTTLSUI.vcxproj rename to EAPMethods/build/EAPTTLS_UI.vcxproj index 2a835d1..8580ba0 100644 --- a/EAPMethods/build/EAPTTLSUI.vcxproj +++ b/EAPMethods/build/EAPTTLS_UI.vcxproj @@ -28,7 +28,7 @@ {DD7A97CA-F18E-43B7-95C4-D06E6A291624} - EAPTTLSUI + EAPTTLS_UI 10.0 @@ -78,7 +78,7 @@ - + @@ -100,16 +100,16 @@ - + - - + + Create - + @@ -165,7 +165,7 @@ - + diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj.filters b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters similarity index 93% rename from EAPMethods/build/EAPTTLSUI.vcxproj.filters rename to EAPMethods/build/EAPTTLS_UI.vcxproj.filters index e3fb9d7..b02d8d3 100644 --- a/EAPMethods/build/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/build/EAPTTLS_UI.vcxproj.filters @@ -19,25 +19,25 @@ - + Header Files - + Source Files - + Source Files - + Resource Files - + Source Files diff --git a/EAPMethods/res/EAPTTLSUI.rc b/EAPMethods/res/EAPTTLS_UI.rc similarity index 99% rename from EAPMethods/res/EAPTTLSUI.rc rename to EAPMethods/res/EAPTTLS_UI.rc index 7f22d05c5a4313853c0166f73d3d397677eb02ec..c1bee20ed342e27046f6917dc3f9397cbf0292c4 100644 GIT binary patch delta 14 WcmaE-_d##NJQ2qD&2vRAG64WH#0E3~ delta 12 UcmeyM_fBuaJdw={L@qD^04i4n)&Kwi diff --git a/EAPMethods/src/MainUI.cpp b/EAPMethods/src/Main_UI.cpp similarity index 97% rename from EAPMethods/src/MainUI.cpp rename to EAPMethods/src/Main_UI.cpp index c1b52cd..dc22130 100644 --- a/EAPMethods/src/MainUI.cpp +++ b/EAPMethods/src/Main_UI.cpp @@ -18,7 +18,7 @@ along with GÉANTLink. If not, see . */ -#include "StdAfxUI.h" +#include "StdAfx_UI.h" #pragma comment(lib, "msxml6.lib") diff --git a/EAPMethods/src/StdAfxUI.cpp b/EAPMethods/src/StdAfx_UI.cpp similarity index 94% rename from EAPMethods/src/StdAfxUI.cpp rename to EAPMethods/src/StdAfx_UI.cpp index 5a1ef45..be1cad5 100644 --- a/EAPMethods/src/StdAfxUI.cpp +++ b/EAPMethods/src/StdAfx_UI.cpp @@ -1,21 +1,21 @@ -/* - Copyright 2015-2020 Amebis - Copyright 2016 GÉANT - - This file is part of GÉANTLink. - - GÉANTLink is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - GÉANTLink is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GÉANTLink. If not, see . -*/ - -#include "StdAfxUI.h" +/* + Copyright 2015-2020 Amebis + Copyright 2016 GÉANT + + This file is part of GÉANTLink. + + GÉANTLink is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + GÉANTLink is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GÉANTLink. If not, see . +*/ + +#include "StdAfx_UI.h" diff --git a/EAPMethods/src/StdAfxUI.h b/EAPMethods/src/StdAfx_UI.h similarity index 100% rename from EAPMethods/src/StdAfxUI.h rename to EAPMethods/src/StdAfx_UI.h diff --git a/GEANTLink.sln b/GEANTLink.sln index ec6a4bb..e30cfed 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\build\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS_UI", "EAPMethods\build\EAPTTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}" EndProject diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak index a56f4a9143cfe9d36b6db15a1f3b2525960b22ca..aac57c750062336ab25d5cb581b0bf85df35d00a 100644 GIT binary patch delta 84 zcmbQBHA!oO96MwDW?A-RX8w4FPzFy1J%$v993WKM+|RX^5nXU{z2M8qCcH;5#QV9P KZhph3!Uh0Y4iz^5 delta 80 zcmbQFH9>2G9Q$Sk_9SNhPzFy1J%$v993WI;P}n??Yb_%$is0mW!Pk?`c#ohfojj52 K>E?HQDr^7+z7zxi diff --git a/MakefilePlatCfg.mak b/MakefilePlatCfg.mak index 144ef33f54cbe17fe3723cf4b3efedbde62b1df4..9c7d02fe0ddbbedfb2d029093faaf6494215a157 100644 GIT binary patch delta 23 dcmX@}f$_oz#tl6pjPaYhMUt6-)LXImL;!(A3A_LR delta 23 fcmcccf$_`-#tl6plRt@xY+fYd$F%vASX?3ijYbNw diff --git a/README.md b/README.md index 2e2f952..5e60d9c 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Before one can attempt to debug EAP DLLs, you should run `nmake register` from a Next, one must configure a network profile to actually use one of this product's EAP modules for the authentication. -EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_). +EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLS_UI.dll_). ##### Backend DLL diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index 3f9e962..6f00d8f 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -524,7 +524,7 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance, _In_opt_ HWND hwnd s_locale = new wxLocale; if (wxInitializeLocale(*s_locale)) { s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); - s_locale->AddCatalog(wxT("EAPTTLSUI")); + s_locale->AddCatalog(wxT("EAPTTLS_UI")); } } diff --git a/output/locale/.gitignore b/output/locale/.gitignore index a9f0038..c98c6af 100644 --- a/output/locale/.gitignore +++ b/output/locale/.gitignore @@ -1,4 +1,4 @@ -*/EAPTTLSUI.mo +*/EAPTTLS_UI.mo */EventMonitor.mo */wxExtend*.mo */wxstd.mo