Merge remote-tracking branch 'refs/remotes/origin/develop'

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -0,0 +1,220 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+*.opendb
+/FBE.h
+installer/Input/
+installer/*.exe

CHANGELOG.md

@@ -0,0 +1,13 @@
+# FictionBook Editor Changelog
+
+## v2.6.8
+
+* Upgade Visual Studio solution and projects to VS2015 version;
+* Add missing ExportHTML and FBV projects from [FBTools](https://haali.su/pocketpc/files/FictionBook%20Tools%20v2.0%20Setup.exe);
+* Add missing files from FBE distribution (genres.txt_L, genres.rus.txt_L);
+* Upgrade bundled [WTL v8.1](https://sourceforge.net/projects/wtl/) to v9.1 using [NuGet packaging system](https://www.nuget.org/). WTL sources are automatically restored when you build solution first time;
+* Upgrade [PCRE v7.9](http://www.pcre.org/) to v8.37, PCRE is now build from sources;
+* Upgrade [Hunspell](http://hunspell.sourceforge.net/) to v1.3.3, Hunspell is now build from sources;
+* Fix installer to propertly work under Windows Vista and higher (set `RequestExecutionLevel` to `admin`);
+* Remove references to [UAC plugin](http://nsis.sourceforge.net/UAC_plug-in) from installer, it's needed for Windows 2000 only, but we don't support it;
+* Add version info to all exe's and dll's.

ExportHTML/ExportHTML.cpp

@@ -0,0 +1,72 @@
+#include "stdafx.h"
+#include "resource.h"
+
+#include "utils.h"
+#include "FBE.h"
+
+#include "ExportHTML.h"
+
+#include <initguid.h>
+
+// {E242A6D3-84BF-4285-9FAA-160F95370668}
+DEFINE_GUID(CLSID_ExportHTMLPlugin, 
+0xe242a6d3, 0x84bf, 0x4285, 0x9f, 0xaa, 0x16, 0xf, 0x95, 0x37, 0x6, 0x68);
+
+CComModule  _Module;
+CRegKey	    _Settings;
+CString	    _SettingsPath;
+
+BEGIN_OBJECT_MAP(ObjectMap)
+  OBJECT_ENTRY(CLSID_ExportHTMLPlugin, ExportHTMLPlugin)
+END_OBJECT_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// DLL Entry Point
+
+extern "C"
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
+{
+  if (dwReason == DLL_PROCESS_ATTACH)
+  {
+    _Module.Init(ObjectMap, hInstance);
+    DisableThreadLibraryCalls(hInstance);
+    U::InitSettings();
+  }
+  else if (dwReason == DLL_PROCESS_DETACH) {
+    _Module.Term();
+  }
+  return TRUE;    // ok
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Used to determine whether the DLL can be unloaded by OLE
+
+STDAPI DllCanUnloadNow(void)
+{
+  return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Returns a class factory to create an object of the requested type
+
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+  return _Module.GetClassObject(rclsid, riid, ppv);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// DllRegisterServer - Adds entries to the system registry
+
+STDAPI DllRegisterServer(void)
+{
+  // registers object, typelib and all interfaces in typelib
+  return _Module.RegisterServer();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// DllUnregisterServer - Removes entries from the system registry
+
+STDAPI DllUnregisterServer(void)
+{
+  return _Module.UnregisterServer();
+}

ExportHTML/ExportHTML.def

@@ -0,0 +1,7 @@
+LIBRARY      "ExportHTML.DLL"
+
+EXPORTS
+	DllCanUnloadNow     PRIVATE
+	DllGetClassObject   PRIVATE
+	DllRegisterServer   PRIVATE
+	DllUnregisterServer PRIVATE

ExportHTML/ExportHTML.h

@@ -0,0 +1,23 @@
+#ifndef EXPORTHTML_H
+#define EXPORTHTML_H
+
+EXTERN_C const GUID CLSID_ExportHTMLPlugin;
+
+class ExportHTMLPlugin :
+  public CComObjectRoot,
+  public CComCoClass<ExportHTMLPlugin, &CLSID_ExportHTMLPlugin>,
+  public IFBEExportPlugin
+{
+public:
+  DECLARE_REGISTRY_RESOURCEID(IDR_EXPORTHTML)
+
+  DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+  BEGIN_COM_MAP(ExportHTMLPlugin)
+    COM_INTERFACE_ENTRY(IFBEExportPlugin)
+  END_COM_MAP()
+
+  // IFBEExportPlugin
+  STDMETHOD(Export)(long hWnd,BSTR filename,IDispatch *doc);
+};
+#endif