diff --git a/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj b/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
index 11c12df60c..8d1be8a043 100644
--- a/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
+++ b/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
@@ -425,6 +425,10 @@
RelativePath="..\DesktopEditor\raster\Metafile\Common.h"
>
+
+
@@ -433,6 +437,30 @@
RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.h"
>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -476,10 +504,26 @@
RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfMemory.h"
>
+
+
+
+
+
+
+
+
@@ -500,6 +544,10 @@
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
>
+
+
@@ -520,6 +568,10 @@
RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
>
+
+
diff --git a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h
index d2d6ca7b98..293b6bfef1 100644
--- a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h
+++ b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h
@@ -3,7 +3,9 @@
#include
-#if !defined(_WIN32) && !defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64)
+ #include
+#else
#include "../../DesktopEditor/common/ASCVariant.h"
#endif
@@ -39,8 +41,8 @@ public:
return m_strTempDirectory;
}
- HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack);
- HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack);
+ HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack = NULL);
+ HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack = NULL);
};