Update information

CHANGELOG.md

@@ -1,5 +1,10 @@
 # FictionBook Editor Changelog
 
+## v2.6.10
+
+* 64-bit FBShell build - now shell extension works under 64-bit OS. The installer will automatically install the correct version.
+* FBE now uses MSXML 6.0 instead of 4.0. This version is default XML parser in WinXP SP3 and supported up to Windows 10.
+
 ## v2.6.9
 
 * Fixed bug, introduced in 2.6.9 - FBE cannot find plugins

FBE/FBE.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Jan 20 13:46:07 2016
+/* at Wed Jan 20 14:11:40 2016
  */
 /* Compiler settings for fbe.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 

FBSHell/FBShell_h.h

@@ -4,10 +4,10 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Jan 20 13:45:27 2016
+/* at Wed Jan 20 14:33:44 2016
  */
 /* Compiler settings for FBShell.idl:
-    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
+    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 7.00.0555 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 
     VC __declspec() decoration level: 

Installer/GenerateInstallers.bat

@@ -1,14 +1,14 @@
-rem bat ôàéë ãåíåðèò 20 ðàáîòàþùèé ðàçëè÷àþùèéõñÿ exe ôàéëîâ èç îäíîãî
-
-rem èñïîëüçîâàíèå: generateinstallers <èìÿ èñõîäíîãî exe ôàéëà>
-rd /S /Q installers
-md installers
-set I=10
-:while
-	md installers\%I%
-	copy /	b %1 installers\%I%\%1
-	echo %I% >> installers\%I%\%1
-	set /a I = %I% + 1
-	if %I% == 30 GOTO end
-GOTO while	
+rem bat ôàéë ãåíåðèò 20 ðàáîòàþùèé ðàçëè÷àþùèéõñÿ exe ôàéëîâ èç îäíîãî
+
+rem èñïîëüçîâàíèå: generateinstallers <èìÿ èñõîäíîãî exe ôàéëà>
+rd /S /Q installers
+md installers
+set I=10
+:while
+	md installers\%I%
+	copy /	b %1 installers\%I%\%1
+	echo %I% >> installers\%I%\%1
+	set /a I = %I% + 1
+	if %I% == 30 GOTO end
+GOTO while	
 :end

Installer/MakeNobuildInstaller.bat

@@ -1,28 +1,28 @@
-@ECHO OFF
-
-if not exist .\Input goto make_input
-rd .\Input /S /Q
-
-:make_input
-md .\Input
-
-if not exist ..\Release\FBE.exe goto err
-if not exist ..\Release\res_rus.dll goto err
-if not exist ..\Release\res_ukr.dll goto err
-if not exist ..\Release\FBSHell.dll goto err
-
-goto ok
-
-:err
-echo "No full Release build exist in ..\Release!"
-exit /b 1
-
-:ok
-copy ..\Release\res_rus.dll .\Input >NUL
-copy ..\Release\res_ukr.dll .\Input >NUL
-copy ..\Release\FBE.exe .\Input\ >NUL
-copy ..\Release\FBShell.dll .\Input\ >NUL
-copy ..\Release\ExportHTML.dll .\Input\ >NUL
-xcopy ..\files\*.* .\Input\ /E /Y >NUL
-
+@ECHO OFF
+
+if not exist .\Input goto make_input
+rd .\Input /S /Q
+
+:make_input
+md .\Input
+
+if not exist ..\Release\FBE.exe goto err
+if not exist ..\Release\res_rus.dll goto err
+if not exist ..\Release\res_ukr.dll goto err
+if not exist ..\Release\FBSHell.dll goto err
+
+goto ok
+
+:err
+echo "No full Release build exist in ..\Release!"
+exit /b 1
+
+:ok
+copy ..\Release\res_rus.dll .\Input >NUL
+copy ..\Release\res_ukr.dll .\Input >NUL
+copy ..\Release\FBE.exe .\Input\ >NUL
+copy ..\Release\FBShell.dll .\Input\ >NUL
+copy ..\Release\ExportHTML.dll .\Input\ >NUL
+xcopy ..\files\*.* .\Input\ /E /Y >NUL
+
 "C:\Program Files\NSIS\Unicode\makensis" MakeInstaller.nsi

NOWTO.md

@@ -4,8 +4,10 @@
 
 To build FBE you need Visual Studio 2015, Community Edition is suitable. You can try previous versions, but it's untested. Nothing else is required.
 
-Don't forget to install [MSXML 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=15697), this component is required to run FictionBook Editor.
-
 ## How to make installer
 
-To make installer you need to install [NSIS Unicode](http://www.scratchpaper.com/). Build Release configuration of FBE, then go to Installer folder. Fist run MakeInstaller.bat to copy required files to Installer folder, and after this load MakeInstaller.nsi to NSIS and compile.
+To make installer you need to install [NSIS Unicode 2.58 or higher](http://www.scratchpaper.com/). Download [inetc plugin](http://nsis.sourceforge.net/Inetc_plug-in) and copy unicode version to \Plugins folder of NSIS.
+
+Then build Release|Win32 configuration of FBE twice (at first build ExportHTML project cannot find autogenerated by FBE project fbe.h header, will be fixed later). Build Release|x64 version of FBShell project.
+
+Fist run \Installer\MakeInstaller.bat to copy required files to Installer folder, and after this load MakeInstaller.nsi to NSIS and compile.

ReadMe.md

@@ -13,6 +13,4 @@ FBE consists of the following components:
 
 ## System requirements
 
-You need at least Windows XP SP3 to run FictionBook Editor, Windows Vista and higher are supported as well. 64-bit OSes are supported, except FBShell, which will not work under 64-bit Explorer.
-
-To run FictionBook Editor [MSXML 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=15697) is required.
+You need at least Windows XP SP3 to run FictionBook Editor, Windows Vista and higher, 32-bit and 64-bit are supported as well.