1.2.5.1 Adjusted: Error Object

tablacus · tablacus · commit 2e8d17d10321 · 2022-04-24T22:19:08.000+09:00
diff --git a/tsc64/Resource.h b/tsc64/Resource.h
@@ -6,4 +6,4 @@
 #define VER_Y		1
 #define VER_M		2
 #define VER_D		5
-#define VER_Z		0
+#define VER_Z		1
diff --git a/tsc64/tsc64.cpp b/tsc64/tsc64.cpp
@@ -1021,6 +1021,7 @@ STDMETHODIMP CTScriptControl::raw_Reset()
 	SafeRelease(&m_pActiveScript);
 	SafeRelease(&m_pEventSink);
 	Clear();
+	m_pError->raw_Clear();
 	return m_bsLang ? S_OK : SetScriptError(1024);
 }
 
@@ -1782,6 +1783,7 @@ STDMETHODIMP CteActiveScriptSite::OnScriptError(IActiveScriptError *pscripterror
 	teClearExceptInfo(pei);
 	if SUCCEEDED(pscripterror->GetExceptionInfo(pei)) {
 		m_hr = pei->scode;
+		m_pSC->m_hr = m_hr;
 		DWORD dwSourceContext = 0;
 		pscripterror->GetSourcePosition(&dwSourceContext, &m_pSC->m_pError->m_ulLine, &m_pSC->m_pError->m_lColumn);
 		teSysFreeString(&m_pSC->m_pError->m_bsText);
