Version set to 1.0c

# Conflicts:
#	lib/WinStd

README.md

@@ -31,6 +31,9 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X plug-ins for enterp
 - [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/ver1.0/CredWrite) for automated user credential import to Credential Manager
 - [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/ver1.0/WLANManager) to allow network profile configuration dialog shortcuts
 
+## Download
+Binaries are available for download [here](https://github.com/Amebis/GEANTLink/releases).
+
 ## Building
 
 ### Building Environment Requirements
@@ -113,3 +116,6 @@ Command            | Explanation
 `nmake SetupDebug` | Builds a debug version of project and debug MSI setup files. The resulting files can be found in `output\Setup` folder.
 
 The `/ls` flag can be appended to the commands above to reduce NMAKE’s verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+
+### Translating into your language
+GÉANTLink is fully localizable. We kindly invite you to help [translating it on Transifex](https://www.transifex.com/eduroam_devel/geantlink/).

WLANManager/Main.cpp

@@ -90,7 +90,6 @@ static int WLANManager()
         }
 
         // Launch WLAN profile config dialog.
-        // Note: When a debugger is attached to this process the WlanUIEditProfile() will raise an exception and fail.
         WLAN_REASON_CODE wlrc;
         DWORD dwResult = WlanUIEditProfile(WLAN_UI_API_VERSION, pwcArglist[2], &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, WLSecurityPage, NULL, &wlrc);
         if (dwResult != ERROR_SUCCESS) {
@@ -119,18 +118,26 @@ int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
+    int res = 0;
+
     {
-        // Initialize Windows XP visual styles
-        INITCOMMONCONTROLSEX icc;
-        icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
-        icc.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES | ICC_LINK_CLASS;
-        InitCommonControlsEx(&icc);
+        // Note: When a debugger is attached to this process, the WlanUIEditProfile() will raise an exception and fail.
+        // It was accidentially discovered, that COM initialization resolves this issue.
+        com_initializer com_init(NULL);
+
+        {
+            // Initialize Windows XP visual styles
+            INITCOMMONCONTROLSEX icc;
+            icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
+            icc.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES | ICC_LINK_CLASS;
+            InitCommonControlsEx(&icc);
+        }
+
+        pfnWlanReasonCodeToString = WlanReasonCodeToString;
+
+        res = WLANManager();
     }
 
-    pfnWlanReasonCodeToString = WlanReasonCodeToString;
-
-    int res = WLANManager();
-
     assert(!_CrtDumpMemoryLeaks());
     return res;
 }

include/Version.h

@@ -29,7 +29,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01001d00
+#define PRODUCT_VERSION          0x01001e00
 
 //
 // Product version by components
@@ -39,26 +39,26 @@
 //
 #define PRODUCT_VERSION_MAJ      1
 #define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      29
+#define PRODUCT_VERSION_REV      30
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.0b"
-#define PRODUCT_BUILD_YEAR_STR   "2016"
+#define PRODUCT_VERSION_STR      "1.0c"
+#define PRODUCT_BUILD_YEAR_STR   "2017"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.0.29"
+#define PRODUCT_VERSION_INST     "1.0.30"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{7DCB9632-6524-4590-A16F-173FB117F494}"
+#define PRODUCT_VERSION_GUID     "{263EA84A-04C5-4AD2-98DF-6A3650278D67}"
 
 //
 // Product vendor

lib/EAPBase/include/Config.h

@@ -692,5 +692,6 @@ inline size_t pksizeof(_In_ const eap::config_method::status_t &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method::status_t &val)
 {
+    val = (eap::config_method::status_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }

lib/EAPBase/include/Credentials.h

@@ -583,5 +583,6 @@ inline size_t pksizeof(_In_ const eap::credentials_pass::enc_alg_t &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::credentials_pass::enc_alg_t &val)
 {
+    val = (eap::credentials_pass::enc_alg_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }

lib/EAPBase/include/EAP.h

@@ -1022,9 +1022,11 @@ inline size_t pksizeof(const winstd::cert_context &val)
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::cert_context &val)
 {
     DWORD dwCertEncodingType;
+    assert(sizeof(dwCertEncodingType) == sizeof(unsigned int));
     cursor >> (unsigned int&)dwCertEncodingType;
 
     DWORD dwCertEncodedSize;
+    assert(sizeof(dwCertEncodingType) == sizeof(unsigned int));
     cursor >> (unsigned int&)dwCertEncodedSize;
 
     if (dwCertEncodedSize) {
@@ -1051,6 +1053,7 @@ inline size_t pksizeof(_In_ const winstd::eap_type_t &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::eap_type_t &val)
 {
+    val = (winstd::eap_type_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
 

lib/TLS_UI/res/wxTLS_UI.cpp

@@ -55,7 +55,6 @@ wxTLSServerTrustPanelBase::wxTLSServerTrustPanelBase( wxWindow* parent, wxWindow
 	sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 );
 	
 	m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_root_ca_remove->Enable( false );
 	m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") );
 	
 	sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 );

lib/TLS_UI/res/wxTLS_UI.fbp

@@ -659,7 +659,7 @@
                                                         <property name="dock">Dock</property>
                                                         <property name="dock_fixed">0</property>
                                                         <property name="docking">Left</property>
-                                                        <property name="enabled">0</property>
+                                                        <property name="enabled">1</property>
                                                         <property name="fg"></property>
                                                         <property name="floatable">1</property>
                                                         <property name="font"></property>

lib/TTLS_UI/src/Module.cpp

@@ -37,7 +37,7 @@ public:
 protected:
     static wxCriticalSection s_lock;        ///< Initialization lock
     static unsigned long s_init_ref_count;  ///< Initialization reference counter
-    static wxLocale s_locale;               ///< Locale
+    static wxLocale *s_locale;              ///< Locale
 };
 
 
@@ -343,9 +343,10 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance)
 
     // Do our wxWidgets configuration and localization initialization.
     wxInitializeConfig();
-    if (wxInitializeLocale(s_locale)) {
-        s_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
-        s_locale.AddCatalog(wxT("EAPTTLSUI"));
+    s_locale = new wxLocale;
+    if (wxInitializeLocale(*s_locale)) {
+        s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
+        s_locale->AddCatalog(wxT("EAPTTLSUI"));
     }
 }
 
@@ -357,9 +358,14 @@ wxInitializerPeer::~wxInitializerPeer()
         return;
 
     wxEntryCleanup();
+
+    if (s_locale) {
+        delete s_locale;
+        s_locale = NULL;
+    }
 }
 
 
 wxCriticalSection wxInitializerPeer::s_lock;
 unsigned long wxInitializerPeer::s_init_ref_count = 0;
-wxLocale wxInitializerPeer::s_locale;
+wxLocale *wxInitializerPeer::s_locale = NULL;