work windows version

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

work windows version
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63771 954022d7-b5bf-4e40-9824-e11837661b57
bd83a389 · Oleg.Korshul · Alexander Trofimov · b898a069 · bd83a389 · bd83a389
Commit bd83a389 authored Jul 30, 2015 by Oleg.Korshul Committed by Alexander Trofimov May 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 4 deletions

HtmlFile/HtmlFile.cpp HtmlFile/HtmlFile.cpp +12 -3

HtmlFile/HtmlFile.h HtmlFile/HtmlFile.h +13 -0

HtmlFile/test/main.cpp HtmlFile/test/main.cpp +11 -1

No files found.
--- a/HtmlFile/HtmlFile.cpp
+++ b/HtmlFile/HtmlFile.cpp
@@ -36,12 +36,19 @@ int CHtmlFile::Convert(const std::wstring& sXml, const std::wstring& sPathIntern
    ZeroMemory(&sturtupinfo,sizeof(STARTUPINFO));
    sturtupinfo.cb = sizeof(STARTUPINFO);

+    std::wstring sTempFileForParams = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"XML");
+    NSFile::CFileBinary oFile;
+    oFile.CreateFile(sTempFileForParams);
+    oFile.WriteStringUTF8(sXml, true);
+    oFile.CloseFile();
+
+    std::wstring sApp = L"HtmlFileInternal <html>" + sTempFileForParams;
    wchar_t* pCommandLine = NULL;
    if (!sXml.empty())
    {
-        pCommandLine = new wchar_t[sXml.length() + 1];
-        memcpy(pCommandLine, sXml.c_str(), sXml.length() * sizeof(wchar_t));
-        pCommandLine[sXml.length()] = (wchar_t)'\0';
+        pCommandLine = new wchar_t[sApp.length() + 1];
+        memcpy(pCommandLine, sApp.c_str(), sApp.length() * sizeof(wchar_t));
+        pCommandLine[sApp.length()] = (wchar_t)'\0';
    }

    PROCESS_INFORMATION processinfo;
@@ -62,6 +69,8 @@ int CHtmlFile::Convert(const std::wstring& sXml, const std::wstring& sPathIntern

    CloseHandle(processinfo.hProcess);
    CloseHandle(processinfo.hThread);
+
+    NSFile::CFileBinary::Remove(sTempFileForParams);
 #endif

 #ifdef LINUX

--- a/HtmlFile/HtmlFile.h
+++ b/HtmlFile/HtmlFile.h
@@ -19,6 +19,19 @@ public:
    CHtmlFile();
    ~CHtmlFile();

+    ///
+    /// \brief Convert
+    /// \param sXml -
+    /// <html>
+    ///     <sdk>file:///D:/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb/Word/sdk-all.js</sdk>
+    ///     <file>file:///C:/Users/oleg.korshul/Desktop/original_message%20(5).html</file>
+    ///     <file>file://192.168.3.208/allusers/Files/HTML/AllHTML/cars.html</file>
+    ///     <destination>D:/test/Document/</destination> (end /!!!)
+    /// </html>\
+
+    /// \param sPathInternal - path (subprocesspath = path + HtmlFileInternal.exe) ("" -> GetProcessDirectory()/HtmlFileInternal/HtmlFileInternal.exe)
+    /// \return 1 error, 0 - success
+    ///
    int Convert(const std::wstring& sXml, const std::wstring& sPathInternal = L"");
 };


--- a/HtmlFile/test/main.cpp
+++ b/HtmlFile/test/main.cpp
@@ -7,7 +7,17 @@ int main(int argc, char *argv[])

    CHtmlFile oFile;

-    int nResult = oFile.Convert(L"xml", sPath);
+    std::wstring sXml = L"\
+<html>\
+<sdk>file:///D:/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb/Word/sdk-all.js</sdk>\
+<file>file:///C:/Users/oleg.korshul/Desktop/original_message%20(5).html</file>\
+<file>file://192.168.3.208/allusers/Files/HTML/AllHTML/cars.html</file>\
+<destination>D:/test/Document/</destination>\
+</html>\
+";
+
+    int nResult = oFile.Convert(sXml, sPath);
+    nResult;

    return 0;
 }