git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52537 954022d7-b5bf-4e40-9824-e11837661b57

ASCImageStudio3/ASCGraphics/Interfaces/BaseThread.h

@@ -49,7 +49,14 @@ public:
 		m_bRunThread = FALSE;
 		if (NULL!=m_hThread)
 			WaitForSingleObject(m_hThread,INFINITE);
-		RELEASEHANDLE(m_hThread);
+
+		if (NULL != m_hThread)
+		{
+			CloseHandle (m_hThread);
+			m_hThread = NULL;
+		}
+
+		//RELEASEHANDLE(m_hThread);
 	}
 	inline BOOL IsSuspended() const
 	{		

ASCImageStudio3/ASCGraphics/Objects/Image/EMFInterpreter.h

@@ -2315,7 +2315,7 @@ public:
 	{
 		IS_VALID(m_pRenderer)
 
-		EMRALPHABLEND *pRec = (EMRALPHABLEND*)m_pRecord;
+		//EMRALPHABLEND *pRec = (EMRALPHABLEND*)m_pRecord;
 
 		//ASSERT(pRec->offBmiSrc && pRec->offBitsSrc);
 
@@ -2362,7 +2362,7 @@ public:
 	{
 		IS_VALID(m_pRenderer)
 
-		EMRTRANSPARENTBLT *pRec = (EMRTRANSPARENTBLT*)m_pRecord;
+		//EMRTRANSPARENTBLT *pRec = (EMRTRANSPARENTBLT*)m_pRecord;
 		//ASSERT(pRec->offBmiSrc && pRec->offBitsSrc);
 
 		//// Check if there is a bitmap
@@ -2396,7 +2396,7 @@ public:
 	{
 		IS_VALID(m_pRenderer)
 
-		EMRGRADIENTFILL *pRec = (EMRGRADIENTFILL*)m_pRecord;
+		//EMRGRADIENTFILL *pRec = (EMRGRADIENTFILL*)m_pRecord;
 
 		//LPBYTE pMesh = (LPBYTE)&pRec->Ver[pRec->nVer];
 		//m_pRenderer->SCGradientFill(pRec->Ver, pRec->nVer, pMesh, pRec->nTri, pRec->ulMode);

ASCOfficeDocxFile2/stdafx.h

@@ -50,14 +50,14 @@
 using namespace ATL;
 #include "../Common/ASCUtils.h"
 
-#include "../../../../AVSImageStudio3/AVSGraphics/Interfaces/AVSRenderer.h"
-#import "../../../../../Redist/AVSMediaCore3.dll"		named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../../../../../Redist/AVSImageStudio3.dll"	named_guids raw_interfaces_only rename_namespace("AVSImageStudio")
-#import "../../../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"	named_guids raw_interfaces_only rename_namespace("Fonts")
+#include "../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
+#import "../Redist/ASCMediaCore3.dll"		named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
+#import "../Redist/ASCImageStudio3.dll"	named_guids raw_interfaces_only rename_namespace("AVSImageStudio")
+#import "../Redist/ASCFontConverter.dll"	named_guids raw_interfaces_only rename_namespace("Fonts")
 #import "../../../../../Redist/AVSOfficeStudio/AVSOfficePPTXFile.dll"	raw_interfaces_only rename_namespace("PPTXFile")
 
 #ifdef SOLUTION_ASCOFFICEDOCXFILE2
-#import "../../../../../Redist\AVSGraphics.dll"		named_guids raw_interfaces_only rename_namespace("AVSGraphics")//, exclude(IAVSRenderer)
+#import "../Redist/ASCGraphics.dll"		named_guids raw_interfaces_only rename_namespace("AVSGraphics")//, exclude(IAVSRenderer)
 #endif
 
 #include "../Common/DocxFormat/Source/DocxFormat/Docx.h"