From 498de1ac911e4845d0794f9308a7991d5295db2a Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Mon, 27 Feb 2023 11:15:03 +0800
Subject: [PATCH] Fix ActiveX

---
 .gitignore                                |  4 +++-
 3rdParty/scintilla/CMakeLists.txt         |  2 +-
 CMakeLists.txt                            |  2 +-
 DmMain/inc/Common/ActiveX/DMActiveXBase.h | 12 ++++++------
 DmMain/src/Widgets/DUIActiveX.cpp         |  2 +-
 DmMain/src/Widgets/DUIIE.cpp              |  9 +++++----
 ci/build.ps1                              |  4 ++--
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23982ea4..7c9442cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ ignored/*.*
 *.suo
 /.vs
 /.xs
-/build*
\ No newline at end of file
+/build*
+
+/cmake-*
\ No newline at end of file
diff --git a/3rdParty/scintilla/CMakeLists.txt b/3rdParty/scintilla/CMakeLists.txt
index 4300a6bb..43c5aa68 100644
--- a/3rdParty/scintilla/CMakeLists.txt
+++ b/3rdParty/scintilla/CMakeLists.txt
@@ -5,7 +5,7 @@
 # 		<Author>	<Time>		<Version>	  <Des>
 #      guoyou		2016-10-14	1.0		
 #-------------------------------------------------------
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.21)
 PROJECT(scintilla)
 
 # 文件分组（过滤），同时必须加入到ADD_LIBRARY中才能显示
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d9a98f1..7d9ef8b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 #      guoyou		2015-1-5	1.0
 #      k000     2017-07-11            淇椤圭洰浣滀负瀛愰」鐩紩鍏ユ椂PrecompiledHeader.cmake璺緞閿欒
 #-------------------------------------------------------
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.21)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 cmake_policy(SET CMP0079 NEW)
diff --git a/DmMain/inc/Common/ActiveX/DMActiveXBase.h b/DmMain/inc/Common/ActiveX/DMActiveXBase.h
index 541b9f96..9145aef0 100644
--- a/DmMain/inc/Common/ActiveX/DMActiveXBase.h
+++ b/DmMain/inc/Common/ActiveX/DMActiveXBase.h
@@ -361,7 +361,7 @@ namespace DM
 						break;
 					}
 
-					DMComQIPtr<IPersistStreamInit> spPSI = (DMComQIPtr<IPersistStreamInit>&)spControl;
+					DMComQIPtr<IPersistStreamInit> spPSI(spControl);
 					if (spPSI != NULL)
 					{
 						if (pStream != NULL)
@@ -390,7 +390,7 @@ namespace DM
 						break;
 					}
 
-					DMComQIPtr<IPersistStreamInit> spPSI = (DMComQIPtr<IPersistStreamInit>&)m_spControl;
+					DMComQIPtr<IPersistStreamInit> spPSI(m_spControl);
 					if (spPSI != NULL)
 					{
 						if (pStream != NULL)
@@ -435,7 +435,7 @@ namespace DM
 					if (m_dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST) 
 					{
 						hr = spOleObject->SetClientSite(static_cast<IOleClientSite*>(this));
-						DMComQIPtr<IOleWindow> ole_window = (DMComQIPtr<IOleWindow>&)m_spGitControl;
+						DMComQIPtr<IOleWindow> ole_window(m_spGitControl);
 						HWND hWnd = NULL;
 						ole_window->GetWindow(&hWnd);
 
@@ -477,7 +477,7 @@ namespace DM
 					if (m_dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST) 
 					{
 						hr = m_spOleObject->SetClientSite(static_cast<IOleClientSite*>(this));
-						DMComQIPtr<IOleWindow> ole_window = (DMComQIPtr<IOleWindow>&)m_spControl;
+						DMComQIPtr<IOleWindow> ole_window(m_spControl);
 						HWND hWnd = NULL;
 						ole_window->GetWindow(&hWnd);
 
@@ -1223,7 +1223,7 @@ namespace DM
 				{
 					// todo.
 				}
-				DMComQIPtr<IAdviseSink> advise_sink = (DMComQIPtr<IAdviseSink>&)m_spGitControl;
+				DMComQIPtr<IAdviseSink> advise_sink(m_spGitControl);
 				m_spGitOleObject->Advise(advise_sink, &m_dwOleObjSink);
 
 				if (m_spGitViewObject)
@@ -1257,7 +1257,7 @@ namespace DM
 						m_dwViewObjectType = 1;
 					}
 				}
-				DMComQIPtr<IAdviseSink> advise_sink = (DMComQIPtr<IAdviseSink>&)m_spControl;
+				DMComQIPtr<IAdviseSink> advise_sink(m_spControl);
 				m_spOleObject->Advise(advise_sink, &m_dwOleObjSink);
 
 				if (m_spViewObject)
diff --git a/DmMain/src/Widgets/DUIActiveX.cpp b/DmMain/src/Widgets/DUIActiveX.cpp
index 2d806d22..d8c769d2 100644
--- a/DmMain/src/Widgets/DUIActiveX.cpp
+++ b/DmMain/src/Widgets/DUIActiveX.cpp
@@ -36,7 +36,7 @@ namespace DM
 			{
 				break;
 			}
-			DMComQIPtr<IOleWindow> pOleWnd = (DMComQIPtr<IOleWindow>&)pUnknown;
+			DMComQIPtr<IOleWindow> pOleWnd(pUnknown);
 			if (NULL == pOleWnd)
 			{
 				break;
diff --git a/DmMain/src/Widgets/DUIIE.cpp b/DmMain/src/Widgets/DUIIE.cpp
index 439ef517..efaebd7e 100644
--- a/DmMain/src/Widgets/DUIIE.cpp
+++ b/DmMain/src/Widgets/DUIIE.cpp
@@ -653,7 +653,7 @@ namespace DM
 				break;
 			}
 			
-			DMComQIPtr<IOleInPlaceActiveObject> spInPlaceActiveObject = (DMComQIPtr<IOleInPlaceActiveObject>&)pWeb;
+			DMComQIPtr<IOleInPlaceActiveObject> spInPlaceActiveObject(pWeb);
 			if (spInPlaceActiveObject)
 			{			
 				bRet =(S_OK == spInPlaceActiveObject->TranslateAccelerator(pMsg))?true:false;
@@ -676,7 +676,7 @@ namespace DM
 		HRESULT hr = E_FAIL;
 		do 
 		{
-			DMComQIPtr<IConnectionPointContainer> pCPC = (DMComQIPtr<IConnectionPointContainer>&)Ptr();
+			DMComQIPtr<IConnectionPointContainer> pCPC(Ptr());
 			if (!pCPC)
 			{
 				break;
@@ -844,7 +844,7 @@ namespace DM
 				break;
 			}
 
-			DMComQIPtr<IOleWindow> pOleWnd = (DMComQIPtr<IOleWindow>&)pUnknown;
+			DMComQIPtr<IOleWindow> pOleWnd(pUnknown);
 			if (NULL == pOleWnd)
 			{
 				break;
@@ -1062,7 +1062,8 @@ namespace DM
 					try 
 					{
 						_bstr_t _bsScript(pszScript);
-						hr = spWin->execScript(_bsScript, _bstr_t(L"JavaScript"), &vRetCode);
+						_bstr_t _bsScriptType(L"JavaScript");
+						hr = spWin->execScript(_bsScript, _bsScriptType, &vRetCode);
 					} 
 					catch(...) 
 					{
diff --git a/ci/build.ps1 b/ci/build.ps1
index 8831585d..534ac1fb 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,7 +1,7 @@
-# Install latest cmake version for appveyor ci
 # refer to: https://docs.github.com/en/actions/learn-github-actions/environment-variables
 if (!($env:GITHUB_ACTIONS -eq 'true')) {
-    $cmake_ver="3.25.2"
+    # Install newer cmake for appveyor ci
+    $cmake_ver="3.24.3"
     if(!(Test-Path ".\cmake-$cmake_ver-windows-x86_64\bin" -PathType Container)) {
         curl "https://github.com/Kitware/CMake/releases/download/v$cmake_ver/cmake-$cmake_ver-windows-x86_64.zip" -o "cmake-$cmake_ver-windows-x86_64.zip"
         Expand-Archive -Path cmake-$cmake_ver-windows-x86_64.zip -DestinationPath .\