Getting ready for v5.3.0

Author: pmeems

src/CopyTamasFiles.bat

@@ -36,7 +36,8 @@ xcopy /v /c /r /y %_from_dir%\gdal-data\*.* %_to_dir%gdal-data\
 xcopy /v /c /r /y %_from_dir%\proj\SHARE\*.* %_to_dir%..\PROJ_NAD\
 
 REM Copy needed Tamas binaries:
-FOR %%G IN (cfitsio.dll expat.dll freexl.dll geos.dll geos_c.dll hdf5.dll hdf5_hl.dll hdf5_cpp.dll hdf5_hl_cpp.dll libcrypto-1_1.dll libcrypto-1_1-x64.dll libcurl.dll  
+FOR %%G IN (cfitsio.dll expat.dll freexl.dll geos.dll geos_c.dll hdf5.dll hdf5_hl.dll hdf5_cpp.dll hdf5_hl_cpp.dll libcrypto-1_1.dll libcrypto-1_1-x64.dll 
+			libcurl.dll ssleay32.dll libeay32.dll  
             iconv.dll libmysql.dll libpq.dll libssl-1_1.dll libssl-1_1-x64.dll libtiff.dll libxml2.dll lti_lidar_dsdk_1.1.dll netcdf.dll   
             openjp2.dll proj.dll spatialite.dll sqlite3.dll szip.dll tbb.dll xdrdll.dll zlib1.dll  
             NCSEcw.dll) DO (
@@ -58,7 +59,7 @@ del /f /q %_to_dir%\lti_dsdk*.dll
 xcopy /v /c /r /y %_from_dir%\lti_dsdk*.dll  %_to_dir%
 
 REM Updates for GDAL v3:
-del /f /q %_to_dir%\gdal*.dll
+del /f /q %_to_dir%\gdal3*.dll
 xcopy /v /c /r /y %_from_dir%\gdal3*.dll  %_to_dir%
 del /f /q %_to_dir%\proj_6*.dll
 xcopy /v /c /r /y %_from_dir%\proj_6_*.dll  %_to_dir%

src/InnoSetup/MapWinGIS-only.iss

@@ -2,12 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "MapWinGIS"
-#define MyAppVersion "5.2.4"
 #define MyAppPublisher "MapWindow Open Source GIS Community"
 #define MyAppURL "http://www.mapwindow.org"
 #define SetupLocation "D:\dev\MapWindow\MapWinGIS\git\src\InnoSetup"
 #define BinLocation "D:\dev\MapWindow\MapWinGIS\git\src\bin"
-;; #define x64BitVersion
+#define x64BitVersion
 ;; #define VsVersion = "2015" 
 #define VsVersion = "2017" 
 
@@ -23,6 +22,8 @@
   #define SystemFlag "32bit"
 #endif
 
+#define MyAppVersion GetFileVersion(MySourceDir + '\MapWinGIS.ocx')
+
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.

src/InnoSetup/ReleaseNotes.rtf

@@ -3,7 +3,7 @@
 rem The lines above are from http://www.codeproject.com/Tips/119828/Running-a-bat-file-as-administrator-Correcting-cur.aspx
 
 REM Unregister any previous versions:
-regsvr32 /u /s MapWinGIS.ocx
+%systemroot%\SysWoW64\regsvr32 /u /s MapWinGIS.ocx
 REM Register current version:
-regsvr32 /s MapWinGIS.ocx
+%systemroot%\SysWoW64\regsvr32 /s MapWinGIS.ocx
 

src/InnoSetup/regMapWinGIS.cmd

@@ -19,19 +19,19 @@
 #include "TileCacheManager.h"
 
 class CMapWinGISModule :
-	public ATL::CAtlMfcModule
+    public ATL::CAtlMfcModule
 {
 public:
-	DECLARE_LIBID(LIBID_MapWinGIS);
-	DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MAPWINGIS, "{8308CC9E-4AEF-4D31-9081-86CD61B9E641}");
+    DECLARE_LIBID(LIBID_MapWinGIS);
+    DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MAPWINGIS, "{8308CC9E-4AEF-4D31-9081-86CD61B9E641}");
 };
 
 #undef THIS_FILE
 static char THIS_FILE[] = __FILE__;
 
 const GUID CDECL BASED_CODE _tlid = { 0xc368d713, 0xcc5f, 0x40ed, { 0x9f, 0x53, 0xf8, 0x4f, 0xe1, 0x97, 0xb9, 0x6a } };
 const WORD _wVerMajor = 5;
-const WORD _wVerMinor = 2;
+const WORD _wVerMinor = 3;
 
 CMapWinGISApp NEAR theApp;
 CMapWinGISModule _AtlModule;    // this one is from ATL7 (used by all ATL co-classes)
@@ -43,136 +43,136 @@ GlobalClassFactory m_factory;	// make sure that this one is initialized after th
 // ******************************************************
 BOOL CMapWinGISApp::InitInstance()
 {
-	// let's generate floating point exceptions
-	#ifndef RELEASE_MODE
-		//_clearfp();
-		//_controlfp(0, EM_ZERODIVIDE);
-	#endif
+    // let's generate floating point exceptions
+#ifndef RELEASE_MODE
+    //_clearfp();
+    //_controlfp(0, EM_ZERODIVIDE);
+#endif
+
+    Debug::Init();
 
-	Debug::Init();
+    //Neio modified 2009, following http_://www.mapwindow.org/phorum/read.php?7,12162 by gischai, for multi-language support
+    //std::locale::global(std::locale(""));
+    //19-Oct-09 Rob Cairns: (See Bug 1446) - I hate doing this if it prevents our Chinese friends opening Chinese character shapefiles and data.
+    //However, there are just too many bugs associated with this change. See Bug 1446 for more information. Changing back to classic.
+    std::locale::global(std::locale("C"));
 
-	//Neio modified 2009, following http_://www.mapwindow.org/phorum/read.php?7,12162 by gischai, for multi-language support
-	//std::locale::global(std::locale(""));
-	//19-Oct-09 Rob Cairns: (See Bug 1446) - I hate doing this if it prevents our Chinese friends opening Chinese character shapefiles and data.
-	//However, there are just too many bugs associated with this change. See Bug 1446 for more information. Changing back to classic.
-	std::locale::global(std::locale("C"));
+    // http_://stackoverflow.com/questions/7659127/createex-causes-unhandled-exception-the-activation-context-being-deactivated-is
+    //AfxSetAmbientActCtx(FALSE);
 
-	// http_://stackoverflow.com/questions/7659127/createex-causes-unhandled-exception-the-activation-context-being-deactivated-is
-	//AfxSetAmbientActCtx(FALSE);
+    // UTF8 string are expected by default; the enviroment variable shoud be set to restore older behavior
+    // see more details here: http_://trac.osgeo.org/gdal/wiki/ConfigOptions
+    m_globalSettings.SetGdalUtf8(false);
 
-	// UTF8 string are expected by default; the enviroment variable shoud be set to restore older behavior
-	// see more details here: http_://trac.osgeo.org/gdal/wiki/ConfigOptions
-	m_globalSettings.SetGdalUtf8(false);
-	
-	GdalHelper::SetDefaultConfigPaths();
+    GdalHelper::SetDefaultConfigPaths();
 
-	parser::InitializeFunctions();
+    parser::InitializeFunctions();
 
-	// initialize all static variables, to keep our memory leaking report clean from them
+    // initialize all static variables, to keep our memory leaking report clean from them
 #ifdef _DEBUG
-	gMemLeakDetect.stopped = true;
-	GDALAllRegister();
-	gMemLeakDetect.stopped = false;
+    gMemLeakDetect.stopped = true;
+    GDALAllRegister();
+    gMemLeakDetect.stopped = false;
 #endif
 
-	//CMapView::GdiplusStartup(); // moved back to CMapView constructor
+    //CMapView::GdiplusStartup(); // moved back to CMapView constructor
 
-	return COleControlModule::InitInstance() && InitATL();
+    return COleControlModule::InitInstance() && InitATL();
 }
 
 // *****************************************************
 // CMapWinGISApp::ExitInstance - DLL termination
 // *****************************************************
 int CMapWinGISApp::ExitInstance()
 {
-	CPLErrorReset();
+    CPLErrorReset();
 
-	MercatorProjection::ReleaseGeoProjection();
+    MercatorProjection::ReleaseGeoProjection();
 
-	#ifndef RELEASE_MODE
+#ifndef RELEASE_MODE
 
-	CComBSTR bstr;
+    CComBSTR bstr;
     // make sure m_utils is still extant
-	if (m_utils)
-	{
-		m_utils->get_ComUsageReport(VARIANT_TRUE, &bstr);
-	}
+    if (m_utils)
+    {
+        m_utils->get_ComUsageReport(VARIANT_TRUE, &bstr);
+    }
 
-	USES_CONVERSION;
-	CString s = OLE2A(bstr);
-	Debug::WriteLine(s);
+    USES_CONVERSION;
+    CString s = OLE2A(bstr);
+    Debug::WriteLine(s);
 
-	#endif
+#endif
 
-	if (m_utils)
-	{
-		m_utils->Release();
-	}
+    if (m_utils)
+    {
+        m_utils->Release();
+    }
 
-	TileCacheManager::CloseAll();
+    TileCacheManager::CloseAll();
 
-	PrefetchManagerFactory::Clear();
+    PrefetchManagerFactory::Clear();
 
-	parser::ReleaseFunctions();
+    parser::ReleaseFunctions();
 
-	//CMapView::GdiplusShutdown(); // moved back to CMapView destructor
+    //CMapView::GdiplusShutdown(); // moved back to CMapView destructor
 
-	_Module.Term();
-	return COleControlModule::ExitInstance();
+    _Module.Term();
+    return COleControlModule::ExitInstance();
 }
 
 // **************************************************************
 // DllRegisterServer - Adds entries to the system registry
 // **************************************************************
 STDAPI DllRegisterServer(void)
 {
-	_AtlModule.UpdateRegistryAppId(TRUE);
-	HRESULT hRes2 = _AtlModule.RegisterServer(TRUE);
-	if (hRes2 != S_OK)
-		return hRes2;
-	AFX_MANAGE_STATE(_afxModuleAddrThis);
+    _AtlModule.UpdateRegistryAppId(TRUE);
+    HRESULT hRes2 = _AtlModule.RegisterServer(TRUE);
+    if (hRes2 != S_OK)
+        return hRes2;
+    AFX_MANAGE_STATE(_afxModuleAddrThis);
+
+    if (!AfxOleRegisterTypeLib(AfxGetInstanceHandle(), _tlid))
+        return ResultFromScode(SELFREG_E_TYPELIB);
 
-	if (!AfxOleRegisterTypeLib(AfxGetInstanceHandle(), _tlid))
-		return ResultFromScode(SELFREG_E_TYPELIB);
+    if (!COleObjectFactoryEx::UpdateRegistryAll(TRUE))
+        return ResultFromScode(SELFREG_E_CLASS);
 
-	if (!COleObjectFactoryEx::UpdateRegistryAll(TRUE))
-		return ResultFromScode(SELFREG_E_CLASS);
+    return _Module.RegisterServer(TRUE);
 
-	return _Module.RegisterServer(TRUE);
-	
 
-	return NOERROR;
+    return NOERROR;
 }
 
 // **************************************************************
 //   GetModuleInstance
 // **************************************************************
 HINSTANCE GetModuleInstance()
 {
-	HINSTANCE instance = _Module.GetModuleInstance();
-	return instance;
+    HINSTANCE instance = _Module.GetModuleInstance();
+    return instance;
 }
 
 // **************************************************************
 // DllUnregisterServer - Removes entries from the system registry
 // **************************************************************
 STDAPI DllUnregisterServer(void)
 {
-	_AtlModule.UpdateRegistryAppId(FALSE);
-	HRESULT hRes2 = _AtlModule.UnregisterServer(TRUE);
-	if (hRes2 != S_OK)
-		return hRes2;
-	AFX_MANAGE_STATE(_afxModuleAddrThis);
+    _AtlModule.UpdateRegistryAppId(FALSE);
+    HRESULT hRes2 = _AtlModule.UnregisterServer(TRUE);
+    if (hRes2 != S_OK)
+        return hRes2;
+    AFX_MANAGE_STATE(_afxModuleAddrThis);
 
-	if (!AfxOleUnregisterTypeLib(_tlid, _wVerMajor, _wVerMinor))
-		return ResultFromScode(SELFREG_E_TYPELIB);
+    if (!AfxOleUnregisterTypeLib(_tlid, _wVerMajor, _wVerMinor))
+        return ResultFromScode(SELFREG_E_TYPELIB);
 
-	if (!COleObjectFactoryEx::UpdateRegistryAll(FALSE))
-		return ResultFromScode(SELFREG_E_CLASS);
+    if (!COleObjectFactoryEx::UpdateRegistryAll(FALSE))
+        return ResultFromScode(SELFREG_E_CLASS);
 
-	_Module.UnregisterServer(TRUE); //TRUE indicates that typelib is unreg'd
+    _Module.UnregisterServer(TRUE); //TRUE indicates that typelib is unreg'd
 
-	return NOERROR;
+    return NOERROR;
 }
 
 #if !defined(_WIN32_WCE) && !defined(_AMD64_) && !defined(_IA64_)
@@ -199,12 +199,12 @@ STDAPI DllUnregisterServer(void)
 // **************************************************************
 STDAPI DllCanUnloadNow(void)
 {
-	AFX_MANAGE_STATE(AfxGetStaticModuleState());
-	
-	if (_AtlModule.GetLockCount() > 0)
-		return S_FALSE;
-	
-	return (AfxDllCanUnloadNow()==S_OK && _Module.GetLockCount()==0) ? S_OK : S_FALSE;
+    AFX_MANAGE_STATE(AfxGetStaticModuleState());
+
+    if (_AtlModule.GetLockCount() > 0)
+        return S_FALSE;
+
+    return (AfxDllCanUnloadNow() == S_OK && _Module.GetLockCount() == 0) ? S_OK : S_FALSE;
 }
 
 // ******************************************************************
@@ -213,25 +213,25 @@ STDAPI DllCanUnloadNow(void)
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
 #ifdef _DEBUG
-	bool state = gMemLeakDetect.stopped;
-	gMemLeakDetect.stopped = true;
+    bool state = gMemLeakDetect.stopped;
+    gMemLeakDetect.stopped = true;
 #endif
 
-	AFX_MANAGE_STATE(AfxGetStaticModuleState());
-	
-	HRESULT hres;
-	if (S_OK == _AtlModule.GetClassObject(rclsid, riid, ppv))
-		hres = S_OK;
-	else if(AfxDllGetClassObject(rclsid, riid, ppv) == S_OK)
-		hres = S_OK;
-	else
-		hres = _Module.GetClassObject(rclsid, riid, ppv);
-	
+    AFX_MANAGE_STATE(AfxGetStaticModuleState());
+
+    HRESULT hres;
+    if (S_OK == _AtlModule.GetClassObject(rclsid, riid, ppv))
+        hres = S_OK;
+    else if (AfxDllGetClassObject(rclsid, riid, ppv) == S_OK)
+        hres = S_OK;
+    else
+        hres = _Module.GetClassObject(rclsid, riid, ppv);
+
 #ifdef _DEBUG	
-	gMemLeakDetect.stopped = state;
+    gMemLeakDetect.stopped = state;
 #endif
 
-	return hres;
+    return hres;
 }
 
 // *****************************************************************
@@ -241,8 +241,8 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 // According to MSDN this macro is obsolete. OBJECT_ENTRY_AUTO should be used instead
 BEGIN_OBJECT_MAP(ObjectMap)
 #ifdef OLD_API
-	OBJECT_ENTRY(CLSID_ShapefileColorScheme, CShapefileColorScheme)
-	OBJECT_ENTRY(CLSID_ShapefileColorBreak, CShapefileColorBreak)
+    OBJECT_ENTRY(CLSID_ShapefileColorScheme, CShapefileColorScheme)
+    OBJECT_ENTRY(CLSID_ShapefileColorBreak, CShapefileColorBreak)
 #endif
 END_OBJECT_MAP()
 
@@ -251,6 +251,6 @@ END_OBJECT_MAP()
 // *****************************************************************
 BOOL CMapWinGISApp::InitATL()
 {
-	_Module.Init(ObjectMap, AfxGetInstanceHandle());
-	return TRUE;
+    _Module.Init(ObjectMap, AfxGetInstanceHandle());
+    return TRUE;
 }

src/MapWinGIS.cpp

@@ -2,7 +2,7 @@
 #pragma once
 
 #if !defined( __AFXCTL_H__ )
-	#error include 'afxctl.h' before including this file
+#error include 'afxctl.h' before including this file
 #endif
 
 #include "resource.h"
@@ -11,7 +11,7 @@
 #include "GlobalClassFactory.h"
 
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 2
+#define VERSION_MINOR 3
 
 extern const GUID CDECL _tlid;
 extern const WORD _wVerMajor;
@@ -24,10 +24,10 @@ HINSTANCE GetModuleInstance();
 class CMapWinGISApp : public COleControlModule
 {
 public:
-	BOOL InitInstance();
-	int ExitInstance();
+    BOOL InitInstance();
+    int ExitInstance();
 private:
-	BOOL InitATL();
+    BOOL InitATL();
 };
 
 extern GlobalClassFactory m_factory;