Index: ext/FileExtd/Microsoft Win32 FileID APIs 1.1 License Terms.rtf =================================================================== diff -u -N --- ext/FileExtd/Microsoft Win32 FileID APIs 1.1 License Terms.rtf (revision 71bfd29bfef00738456ab96f336feeb8a02c4df6) +++ ext/FileExtd/Microsoft Win32 FileID APIs 1.1 License Terms.rtf (revision 0) @@ -1,116 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;} -{\f37\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f102\fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS;}{\f225\froman\fcharset238\fprq2 Times New Roman CE;}{\f226\froman\fcharset204\fprq2 Times New Roman Cyr;} -{\f228\froman\fcharset161\fprq2 Times New Roman Greek;}{\f229\froman\fcharset162\fprq2 Times New Roman Tur;}{\f230\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f231\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\f232\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f233\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f595\fswiss\fcharset238\fprq2 Tahoma CE;}{\f596\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f598\fswiss\fcharset161\fprq2 Tahoma Greek;} -{\f599\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f600\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f601\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f602\fswiss\fcharset186\fprq2 Tahoma Baltic;} -{\f603\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f604\fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f1245\fswiss\fcharset238\fprq2 Trebuchet MS CE;}{\f1246\fswiss\fcharset204\fprq2 Trebuchet MS Cyr;}{\f1248\fswiss\fcharset161\fprq2 Trebuchet MS Greek;} -{\f1249\fswiss\fcharset162\fprq2 Trebuchet MS Tur;}{\f1252\fswiss\fcharset186\fprq2 Trebuchet MS Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0; -\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{ -\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden -Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}} -{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid4536461}{\*\generator Microsoft Word 11.0.8026;}{\info{\operator Bohus Ondrusek}{\creatim\yr2006\mo9\dy22\hr9\min8}{\revtim\yr2006\mo9\dy22\hr9\min8}{\version2}{\edmins0}{\nofpages3} -{\nofwords1046}{\nofchars5968}{\nofcharsws7001}{\vern24609}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 urn:schemas-microsoft-com:office:smarttags}}\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot4536461 \fet0{\*\wgrffmtfilter 013f} -\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}} -{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar -\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af37\afs28 \ltrch\fcs0 \b\f37\fs28\insrsid4536461 -MICROSOFT SOFTWARE LICENSE TERMS -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrb\brdrs\brdrw10\brsp20 \wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af37\afs28 \ltrch\fcs0 \b\f37\fs28\insrsid4536461 MICROSOFT WIN32 FILEID APIS 1.1}{\rtlch\fcs1 \ab\af37\afs28 \ltrch\fcs0 -\b\f37\fs28\insrsid4536461 -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 These license terms are an agreement between Micro -soft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 updates, -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 supplements, -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Internet-based services, and -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 support services -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 for this software, unless other terms accompany those items. If so, those terms apply. -\par }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 By using the software, you accept these terms. If you do not accept them, do not use the software. -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\brdrt\brdrs\brdrw10\brsp20 \wrapdefault\faauto\rin0\lin0\rtlgutter\itap0 {\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 If you comp -ly with these license terms, you have the rights below. -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\tx360\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\f102\fs20\insrsid4536461 1.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -INSTALLATION AND USE RIGHTS. }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 You may install and use any number of copies of the software on your devices.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 2.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 -Scope of License}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 .}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 - The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly per -mitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -work around any technical limitations in the software; -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation; -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 make more copies of the software than specified in this agreement or allowed by applicable law, despite this limitation; - -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 publish the software for others to copy; -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 rent, lease or lend the software; -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 transfer the software or this agreement to any third party; or -\par }{\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 use the software for commercial software hosting services. -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\tx360\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\f102\fs20\insrsid4536461 3.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -BACKUP COPY.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 You may make one backup copy of the software. You may use it only to reinstall the software.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\f102\fs20\insrsid4536461 4.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 DOCUMENTATION. -}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 -\b\f37\fs19\insrsid4536461 -\par }{\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 5.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 Export Restrictions}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 .}{ -\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 The software is subject to {\*\xmlopen\xmlns1{\factoidname place}}{\*\xmlopen\xmlns1{\factoidname country-region}}United States{\*\xmlclose}{\*\xmlclose} - export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see } -{\field{\*\fldinst {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\ul\cf2\insrsid4536461 HYPERLINK "http://www.microsoft.com/exporting" }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\ul\cf2\insrsid4536461\charrsid4536461 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b4600000068007400740070003a002f002f007700770077002e006d006900630072006f0073006f00660074002e0063006f006d002f006500780070006f007200740069006e0067000000}}}{\fldrslt { -\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\ul\cf2\insrsid4536461 www.microsoft.com/exporting}}}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 .}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }{\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 6.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 SUPPORT SERVICES.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 }{\rtlch\fcs1 -\af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Because this software is \'93as is,\'94 we may not provide support services for it.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }{\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 7.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 Entire Agreement.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 - This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services. -\par }\pard \ltrpar\ql \fi-360\li360\ri0\sb120\sa120\keepn\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\cf1\insrsid4536461 8.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 -\b\caps\f37\fs19\cf1\insrsid4536461 Applicable Law}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\cf1\insrsid4536461 . -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\f102\fs20\insrsid4536461 a.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -{\*\xmlopen\xmlns1{\factoidname place}}{\*\xmlopen\xmlns1{\factoidname country-region}}United States{\*\xmlclose}{\*\xmlclose}.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 If you acquired the software in the -{\*\xmlopen\xmlns1{\factoidname country-region}}United States{\*\xmlclose}, {\*\xmlopen\xmlns1{\factoidname place}}{\*\xmlopen\xmlns1{\factoidname State}}Washington{\*\xmlclose}{\*\xmlclose} - state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other - claims, including claims under state consumer protection laws, unfair competition laws, and in tort.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\f102\fs20\insrsid4536461 b.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 Outside the -{\*\xmlopen\xmlns1{\factoidname place}}{\*\xmlopen\xmlns1{\factoidname country-region}}United States{\*\xmlclose}{\*\xmlclose}.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 - If you acquired the software in any other country, the laws of that country apply.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\tx360\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 9.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 -\b\caps\f37\fs19\insrsid4536461 Legal Effect.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 This agreement describ -es certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the -laws of your country do not permit it to do so.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-357\li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 10.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 -Disclaimer of Warranty.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 The software is licensed \'93as-is.\'94 - You bear the risk of using it. Microsoft gives no express warranties, guarantees or conditions. You may have additional consumer rights under -your local laws which this agreement cannot change. To the extent permitted under your local laws, Microsoft excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement.}{\rtlch\fcs1 \ab\af37\afs19 -\ltrch\fcs0 \b\caps\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \fi-360\li360\ri0\sb120\sa120\nowidctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \ab\af102\afs20 \ltrch\fcs0 \b\caps\f102\fs20\insrsid4536461 11.\tab }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 -\b\caps\f37\fs19\insrsid4536461 Limitation on and Exclusion of Remedies and Damages. }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 -You can recover from Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any other damages, including consequential, lost profits, special, indirect or incidental damages.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 -\b\caps\f37\fs19\insrsid4536461 -\par }\pard \ltrpar\ql \li357\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin357\itap0 {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 This limitation applies to -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law. -\par }\pard \ltrpar\ql \li360\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of - incidental, consequential or other damages. -\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 Please note: As this software is distributed in {\*\xmlopen\xmlns1{\factoidname place}} -{\*\xmlopen\xmlns1{\factoidname City}}Quebec{\*\xmlclose}, {\*\xmlopen\xmlns1{\factoidname country-region}}Canada{\*\xmlclose}{\*\xmlclose}, some of the clauses in this agreement are provided below in French. -\par }\pard \ltrpar\ql \li0\ri0\sb240\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 Remarque : Ce logiciel \'e9tant distribu\'e9 au {\*\xmlopen\xmlns1{\factoidname place}} -{\*\xmlopen\xmlns1{\factoidname City}}Qu\'e9bec{\*\xmlclose}, {\*\xmlopen\xmlns1{\factoidname country-region}}Canada{\*\xmlclose}{\*\xmlclose}, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais. -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 EXON\'c9RATION DE GARANTIE.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 - Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9 -ficier de droits additionnels en vertu du droit local sur la protection dues consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un u -sage particulier et d\rquote absence de contrefa\'e7on sont exclues. -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\keepn\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.}{ -\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 - aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices. -\par Cette limitation concerne : -\par }\pard \ltrpar\ql \fi-360\li720\ri0\sb120\sa120\keepn\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 -tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et -\par }\pard \ltrpar\ql \fi-363\li720\ri0\sb120\sa120\nowidctlpar\tx720\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af3\afs19 \ltrch\fcs0 \f3\fs19\insrsid4536461 \'b7\tab }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 les r\'e9 -clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur. -\par }\pard \ltrpar\ql \li0\ri0\sb120\sa120\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote \'e9 -ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote -exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard. -\par }{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\insrsid4536461 EFFET JURIDIQUE.}{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\insrsid4536461 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr -\'e9vus par les lois de votre pays. }{\rtlch\fcs1 \af37\afs19 \ltrch\fcs0 \f37\fs19\lang1036\langfe1033\langnp1036\insrsid4536461 Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8 -rent les lois de votre pays si celles-ci ne le permettent pas.}{\rtlch\fcs1 \ab\af37\afs19 \ltrch\fcs0 \b\f37\fs19\lang1036\langfe1033\langnp1036\insrsid4536461 -\par }} \ No newline at end of file Index: ext/FileExtd/inc/fileextd.h =================================================================== diff -u -N --- ext/FileExtd/inc/fileextd.h (revision 71bfd29bfef00738456ab96f336feeb8a02c4df6) +++ ext/FileExtd/inc/fileextd.h (revision 0) @@ -1,158 +0,0 @@ -/************************************************************************ -* * -* fileextd.h - This module defines some extensions to the the 32-Bit * -* Windows Base APIs based on file handles. * -* * -* Copyright (c) Microsoft Corp. All rights reserved. * -* * -************************************************************************/ -#ifndef _FILEEXTD_ -#define _FILEEXTD_ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum _FILE_INFO_BY_HANDLE_CLASS { - FileBasicInfo, - FileStandardInfo, - FileNameInfo, - FileRenameInfo, - FileDispositionInfo, - FileAllocationInfo, - FileEndOfFileInfo, - FileStreamInfo, - FileCompressionInfo, - FileAttributeTagInfo, - FileIdBothDirectoryInfo, - FileIdBothDirectoryRestartInfo, - MaximumFileInfoByHandleClass -} FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; - -typedef struct _FILE_BASIC_INFO { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - DWORD FileAttributes; -} FILE_BASIC_INFO, *PFILE_BASIC_INFO; - -typedef struct _FILE_STANDARD_INFO { - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - DWORD NumberOfLinks; - BOOLEAN DeletePending; - BOOLEAN Directory; -} FILE_STANDARD_INFO, *PFILE_STANDARD_INFO; - -typedef struct _FILE_NAME_INFO { - DWORD FileNameLength; - WCHAR FileName[1]; -} FILE_NAME_INFO, *PFILE_NAME_INFO; - -typedef struct _FILE_RENAME_INFO { - BOOLEAN ReplaceIfExists; - HANDLE RootDirectory; - DWORD FileNameLength; - WCHAR FileName[1]; -} FILE_RENAME_INFO, *PFILE_RENAME_INFO; - -typedef struct _FILE_ALLOCATION_INFO { - LARGE_INTEGER AllocationSize; -} FILE_ALLOCATION_INFO, *PFILE_ALLOCATION_INFO; - -typedef struct _FILE_END_OF_FILE_INFO { - LARGE_INTEGER EndOfFile; -} FILE_END_OF_FILE_INFO, *PFILE_END_OF_FILE_INFO; - -typedef struct _FILE_STREAM_INFO { - DWORD NextEntryOffset; - DWORD StreamNameLength; - LARGE_INTEGER StreamSize; - LARGE_INTEGER StreamAllocationSize; - WCHAR StreamName[1]; -} FILE_STREAM_INFO, *PFILE_STREAM_INFO; - -typedef struct _FILE_COMPRESSION_INFO { - LARGE_INTEGER CompressedFileSize; - WORD CompressionFormat; - UCHAR CompressionUnitShift; - UCHAR ChunkShift; - UCHAR ClusterShift; - UCHAR Reserved[3]; -} FILE_COMPRESSION_INFO, *PFILE_COMPRESSION_INFO; - -typedef struct _FILE_ATTRIBUTE_TAG_INFO { - DWORD FileAttributes; - DWORD ReparseTag; -} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO; - -typedef struct _FILE_DISPOSITION_INFO { - BOOLEAN DeleteFile; -} FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO; - -typedef struct _FILE_ID_BOTH_DIR_INFO { - DWORD NextEntryOffset; - DWORD FileIndex; - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER EndOfFile; - LARGE_INTEGER AllocationSize; - DWORD FileAttributes; - DWORD FileNameLength; - DWORD EaSize; - CCHAR ShortNameLength; - WCHAR ShortName[12]; - LARGE_INTEGER FileId; - WCHAR FileName[1]; -} FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; - -BOOL -WINAPI -SetFileInformationByHandle( - __in HANDLE hFile, - __in FILE_INFO_BY_HANDLE_CLASS FileInformationClass, - __in LPVOID lpFileInformation, - __in DWORD dwBufferSize -); - -BOOL -WINAPI -GetFileInformationByHandleEx( - __in HANDLE hFile, - __in FILE_INFO_BY_HANDLE_CLASS FileInformationClass, - __out LPVOID lpFileInformation, - __in DWORD dwBufferSize -); - -typedef enum _FILE_ID_TYPE { - FileIdType, - MaximumFileIdType -} FILE_ID_TYPE, *PFILE_ID_TYPE; - -typedef struct FILE_ID_DESCRIPTOR { - DWORD dwSize; // Size of the struct - FILE_ID_TYPE Type; // Describes the type of identifier passed in. - union { - LARGE_INTEGER FileId; - }; -} FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; - -__out -HANDLE -WINAPI -OpenFileById ( - __in HANDLE hVolumeHint, - __in LPFILE_ID_DESCRIPTOR lpFileId, - __in DWORD dwDesiredAccess, - __in DWORD dwShareMode, - __in_opt LPSECURITY_ATTRIBUTES lpSecurityAttributes, - __in DWORD dwFlagsAndAttributes - ); -#endif - -#ifdef __cplusplus -} -#endif Index: ext/FileExtd/lib/amd64/fileextd.lib =================================================================== diff -u -N -r71bfd29bfef00738456ab96f336feeb8a02c4df6 -r4635360505e8d113395dc8cc394dfb696747e197 Binary files differ Index: ext/FileExtd/lib/i386/fileextd.lib =================================================================== diff -u -N -r71bfd29bfef00738456ab96f336feeb8a02c4df6 -r4635360505e8d113395dc8cc394dfb696747e197 Binary files differ Index: ext/FileExtd/lib/ia64/fileextd.lib =================================================================== diff -u -N -r71bfd29bfef00738456ab96f336feeb8a02c4df6 -r4635360505e8d113395dc8cc394dfb696747e197 Binary files differ Index: ext/googletest/gmock-dynamic-crt.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ ext/googletest/gmock-dynamic-crt.vcxproj (.../gmock-dynamic-crt.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -43,51 +43,51 @@ gmock-dynamic-crt Win32Proj gmock-dynamic-crt - 8.1 + 10.0 StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode Index: ext/googletest/gmock-static-crt.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ ext/googletest/gmock-static-crt.vcxproj (.../gmock-static-crt.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -43,51 +43,51 @@ gmock-static-crt Win32Proj gmock-static-crt - 8.1 + 10.0 StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode true StaticLibrary - v141_xp + v142 Unicode StaticLibrary - v141_xp + v142 Unicode Index: ext/sqlite3/sqlite3.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ ext/sqlite3/sqlite3.vc140.vcxproj (.../sqlite3.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,51 +39,51 @@ sqlite3 Win32Proj sqlite3 - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode Index: src/ch/ch.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/ch/ch.vc140.vcxproj (.../ch.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,54 +39,54 @@ {4B215B9A-58CA-4987-AC95-7DFC3043E100} ch MFCProj - 7.0 + 10.0 Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Index: src/chext/chext.vc140.vcxproj =================================================================== diff -u -N -rbcb96b1fe43d26667bd0b873c16dbf73b6fda54c -r4635360505e8d113395dc8cc394dfb696747e197 --- src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision bcb96b1fe43d26667bd0b873c16dbf73b6fda54c) +++ src/chext/chext.vc140.vcxproj (.../chext.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,58 +39,58 @@ {7CE8B0C5-8CD4-4551-ACBF-EC4749E15E69} chext AtlProj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 false false Unicode DynamicLibrary - v141_xp + v142 false false Unicode DynamicLibrary - v141_xp + v142 false Unicode DynamicLibrary - v141_xp + v142 false Unicode DynamicLibrary - v141_xp + v142 false false Unicode DynamicLibrary - v141_xp + v142 false false Unicode DynamicLibrary - v141_xp + v142 false Unicode DynamicLibrary - v141_xp + v142 false Unicode Index: src/common/Boost.props =================================================================== diff -u -N -r158a0ca91f7ec3e9659543cec425056f94722f31 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/common/Boost.props (.../Boost.props) (revision 158a0ca91f7ec3e9659543cec425056f94722f31) +++ src/common/Boost.props (.../Boost.props) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -6,7 +6,7 @@ $(BOOST_ROOT_PATH);$(BoostDir);$(IncludePath) - $(BOOST_ROOT_PATH)lib-14.1\x$(PlatformArchitecture)\lib\;$(BoostDir)lib-14.1\x$(PlatformArchitecture)\lib\;$(LibraryPath) + $(BOOST_ROOT_PATH)lib-14.2\x$(PlatformArchitecture)\lib\;$(BoostDir)lib-14.2\x$(PlatformArchitecture)\lib\;$(LibraryPath) Index: src/common/FileExtd32.props =================================================================== diff -u -N --- src/common/FileExtd32.props (revision 71bfd29bfef00738456ab96f336feeb8a02c4df6) +++ src/common/FileExtd32.props (revision 0) @@ -1,13 +0,0 @@ - - - - - ../../ext/FileExtd/inc;$(IncludePath) - ../../ext/FileExtd/lib/i386;$(LibraryPath) - - - - fileextd.lib;%(AdditionalDependencies) - - - \ No newline at end of file Index: src/common/FileExtd64.props =================================================================== diff -u -N --- src/common/FileExtd64.props (revision 71bfd29bfef00738456ab96f336feeb8a02c4df6) +++ src/common/FileExtd64.props (revision 0) @@ -1,13 +0,0 @@ - - - - - ../../ext/FileExtd/inc;$(IncludePath) - ../../ext/FileExtd/lib/amd64;$(LibraryPath) - - - - fileextd.lib;%(AdditionalDependencies) - - - \ No newline at end of file Index: src/common/GenericTemplates/RandomAccessIterators.h =================================================================== diff -u -N -rbc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc -r4635360505e8d113395dc8cc394dfb696747e197 --- src/common/GenericTemplates/RandomAccessIterators.h (.../RandomAccessIterators.h) (revision bc3ebabeccf483d086fd58d06ddbc4d8a55c1dfc) +++ src/common/GenericTemplates/RandomAccessIterators.h (.../RandomAccessIterators.h) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -20,12 +20,18 @@ #define __RANDOMACCESSITERATORS_H__ template -class RandomAccessIteratorWrapper : public std::iterator +class RandomAccessIteratorWrapper { protected: explicit RandomAccessIteratorWrapper(typename std::vector::iterator iterArray); public: + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = std::ptrdiff_t; + using pointer = T*; + using reference = T&; + RandomAccessIteratorWrapper(); ~RandomAccessIteratorWrapper(); @@ -62,12 +68,18 @@ }; template -class RandomAccessConstIteratorWrapper : public std::iterator +class RandomAccessConstIteratorWrapper { protected: explicit RandomAccessConstIteratorWrapper(typename std::vector::const_iterator iterArray); public: + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = std::ptrdiff_t; + using pointer = T*; + using reference = T&; + RandomAccessConstIteratorWrapper(); explicit RandomAccessConstIteratorWrapper(const RandomAccessIteratorWrapper& rIterator); ~RandomAccessConstIteratorWrapper(); Index: src/common/targetver.h =================================================================== diff -u -N -r7770d9e0a316d014b75ea4bd88f8b6d13c80c318 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/common/targetver.h (.../targetver.h) (revision 7770d9e0a316d014b75ea4bd88f8b6d13c80c318) +++ src/common/targetver.h (.../targetver.h) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -24,16 +24,16 @@ // your application. The macros work by enabling all features available on platform versions up to and // including the version specified. +#ifndef NTDDI_VERSION + #define NTDDI_VERSION NTDDI_WIN7 +#endif + // Modify the following defines if you have to target a platform prior to the ones specified below. // Refer to MSDN for the latest info on corresponding values for different platforms. #ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows. + #define WINVER _WIN32_WINNT_WIN7 // Change this to the appropriate value to target other versions of Windows. #endif #ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. + #define _WIN32_WINNT _WIN32_WINNT_WIN7 // Change this to the appropriate value to target other versions of Windows. #endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0501 // Change this to the appropriate value to target other versions of IE. -#endif Index: src/common/version.h =================================================================== diff -u -N -rd8c653a7126b6ed8676624d445250ecdf8a509c6 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/common/version.h (.../version.h) (revision d8c653a7126b6ed8676624d445250ecdf8a509c6) +++ src/common/version.h (.../version.h) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -10,7 +10,7 @@ // Version of program #define PRODUCT_VERSION1 1 -#define PRODUCT_VERSION2 45 +#define PRODUCT_VERSION2 50 #define PRODUCT_VERSION3 0 #define PRODUCT_VERSION4 0 @@ -23,7 +23,7 @@ #define PRODUCT_NUMERIC_VERSION STRINGIZE2(PRODUCT_VERSION1) L"." STRINGIZE2(PRODUCT_VERSION2) L"." STRINGIZE2(PRODUCT_VERSION3) L"." STRINGIZE2(PRODUCT_VERSION4) #endif -#define PRODUCT_VERSION "1.45internal-current" +#define PRODUCT_VERSION "1.50internal-current" #if SETUP_COMPILER != 1 #define SHELLEXT_PRODUCT_FULL_VERSION SHELLEXT_PRODUCT_NAME " " PRODUCT_VERSION Index: src/ictranslate/ictranslate.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/ictranslate/ictranslate.vc140.vcxproj (.../ictranslate.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,58 +39,58 @@ {B0292250-B70C-4395-9859-F181FB113DA8} ictranslate MFCProj - 7.0 + 10.0 Application - v141_xp + v142 Dynamic Unicode true Application - v141_xp + v142 Dynamic Unicode true Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode true Application - v141_xp + v142 Dynamic Unicode true Application - v141_xp + v142 Dynamic Unicode Application - v141_xp + v142 Dynamic Unicode Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,95 +39,87 @@ {CBBF380B-7B16-4A1E-8194-758DAD7D8011} libchcore Win32Proj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - - - - - - - - Index: src/libchengine/TLocalFilesystem.cpp =================================================================== diff -u -N -r32e9c223239ddbe4055bf468e92efe33f90f5f94 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libchengine/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision 32e9c223239ddbe4055bf468e92efe33f90f5f94) +++ src/libchengine/TLocalFilesystem.cpp (.../TLocalFilesystem.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -37,7 +37,6 @@ #include "TFileException.h" #include #include "../libchcore/StreamingHelpers.h" -#include using namespace chcore; Index: src/libchengine/TLocalFilesystemFile.cpp =================================================================== diff -u -N -r33b33baa373533d0cff8ea5d25154b370f2b2e05 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libchengine/TLocalFilesystemFile.cpp (.../TLocalFilesystemFile.cpp) (revision 33b33baa373533d0cff8ea5d25154b370f2b2e05) +++ src/libchengine/TLocalFilesystemFile.cpp (.../TLocalFilesystemFile.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -25,7 +25,6 @@ #include "TFileInfo.h" #include "TOverlappedMemoryPool.h" #include "OverlappedCallbacks.h" -#include #include "../libchcore/RoundingFunctions.h" #include "../libchcore/TFileTime.h" #include "../libchcore/StreamingHelpers.h" Index: src/libchengine/libchengine.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/libchengine/libchengine.vcxproj (.../libchengine.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,95 +39,87 @@ {6840F785-917F-46EE-BD56-C296C7A5B9E9} libchengine Win32Proj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - - - - - - - - Index: src/libictranslate/ResourceManager.h =================================================================== diff -u -N -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e) +++ src/libictranslate/ResourceManager.h (.../ResourceManager.h) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -24,6 +24,7 @@ #include #include #include +#include namespace ictranslate { Index: src/libictranslate/cfg.cpp =================================================================== diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libictranslate/cfg.cpp (.../cfg.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libictranslate/cfg.cpp (.../cfg.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -26,6 +26,7 @@ #include #include #include "cfg_ini.h" +#include ////////////////////////////////////////////////////////////////////////////////// // property_tracker class Index: src/libictranslate/cfg_ini.cpp =================================================================== diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libictranslate/cfg_ini.cpp (.../cfg_ini.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -21,6 +21,7 @@ #include #include #include +#include /// Buffer size for reading xml data from a file #define INI_BUFFER 65536 Index: src/libictranslate/config_property.cpp =================================================================== diff -u -N -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libictranslate/config_property.cpp (.../config_property.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) +++ src/libictranslate/config_property.cpp (.../config_property.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -20,6 +20,8 @@ #include "config_property.h" #include #include +#include +#include ////////////////////////////////////////////////////////////////////////////////// // property class Index: src/libictranslate/libictranslate.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/libictranslate/libictranslate.vc140.vcxproj (.../libictranslate.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,58 +39,58 @@ {DD1F3242-7EE4-4F41-8B8D-D833300C445F} libictranslate MFCDLLProj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Dynamic Unicode true DynamicLibrary - v141_xp + v142 Dynamic Unicode true DynamicLibrary - v141_xp + v142 Dynamic Unicode DynamicLibrary - v141_xp + v142 Dynamic Unicode DynamicLibrary - v141_xp + v142 Dynamic Unicode true DynamicLibrary - v141_xp + v142 Dynamic Unicode true DynamicLibrary - v141_xp + v142 Dynamic Unicode DynamicLibrary - v141_xp + v142 Dynamic Unicode Index: src/liblogger/liblogger.vc140.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/liblogger/liblogger.vc140.vcxproj (.../liblogger.vc140.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,52 +39,52 @@ {DF9957D4-3D95-4AC3-AD3F-DCBEA058F79D} liblogger Win32Proj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 Index: src/libserializer/libserializer.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/libserializer/libserializer.vcxproj (.../libserializer.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,95 +39,87 @@ {9490EC08-9CAB-4F99-99D8-0297E5BF6EA7} libserializer Win32Proj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - - - - - - - - Index: src/libstring/libstring.vcxproj =================================================================== diff -u -N -ra2394ceaf63cd30e15d8bf7201aa38b86c5a030b -r4635360505e8d113395dc8cc394dfb696747e197 --- src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision a2394ceaf63cd30e15d8bf7201aa38b86c5a030b) +++ src/libstring/libstring.vcxproj (.../libstring.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,95 +39,87 @@ {5BD38175-9F48-417D-8E5B-7093B1873CE5} libstring Win32Proj - 7.0 + 10.0 DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode true DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary - v141_xp + v142 Unicode DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - - - - - - - - Index: src/regchext/TComRegistrar.cpp =================================================================== diff -u -N -rb556d023b748dfea230575959b6513acf29fd7b3 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/regchext/TComRegistrar.cpp (.../TComRegistrar.cpp) (revision b556d023b748dfea230575959b6513acf29fd7b3) +++ src/regchext/TComRegistrar.cpp (.../TComRegistrar.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -19,6 +19,7 @@ #include "stdafx.h" #include "TComRegistrar.h" #include +#include TComRegistrar::TComRegistrar() { Index: src/regchext/TExtensionDetector.cpp =================================================================== diff -u -N -rb556d023b748dfea230575959b6513acf29fd7b3 -r4635360505e8d113395dc8cc394dfb696747e197 --- src/regchext/TExtensionDetector.cpp (.../TExtensionDetector.cpp) (revision b556d023b748dfea230575959b6513acf29fd7b3) +++ src/regchext/TExtensionDetector.cpp (.../TExtensionDetector.cpp) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -19,6 +19,7 @@ #include "stdafx.h" #include "TExtensionDetector.h" #include +#include #ifdef _WIN64 #define DLL_NATIVE L"chext64.dll" Index: src/regchext/regchext.vcxproj =================================================================== diff -u -N -r587a8a4858c6f0563abbc43ab16e7c5cb5f518de -r4635360505e8d113395dc8cc394dfb696747e197 --- src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 587a8a4858c6f0563abbc43ab16e7c5cb5f518de) +++ src/regchext/regchext.vcxproj (.../regchext.vcxproj) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -39,54 +39,54 @@ {767D21BE-A123-46CD-B5D6-E01714E2A981} regchext MFCProj - 7.0 + 10.0 Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Application - v141_xp + v142 false Unicode Index: tools/boost-build32.bat =================================================================== diff -u -N -r5c266be2a01d402f56cb020cfcb0df2d030b42ef -r4635360505e8d113395dc8cc394dfb696747e197 --- tools/boost-build32.bat (.../boost-build32.bat) (revision 5c266be2a01d402f56cb020cfcb0df2d030b42ef) +++ tools/boost-build32.bat (.../boost-build32.bat) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -1,14 +1,6 @@ -rem This scripts updates the environment (that needs to be previously set up for building with vcvarsall) -rem so that the boost will build with xp compatibility in VS2017. rem Execute this script in the boost directory. setlocal -set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% -set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Bin;%PATH% -set CL=/D_USING_V110_SDK71_;%CL% -set LIB=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Lib;%LIB% -set LINK=/SUBSYSTEM:CONSOLE,5.01 %LINK% +b2 -j 8 --toolset=msvc-14.2 --link=static --threading=multi --runtime-link=shared address-model=32 define=_BIND_TO_CURRENT_VCLIBS_VERSION define=BOOST_USE_WINAPI_VERSION=0x0601 --build-type=complete --stagedir=lib-14.2\x32 stage -b2 -j 8 --toolset=msvc-14.1 --link=static --threading=multi --runtime-link=shared address-model=32 define=_BIND_TO_CURRENT_VCLIBS_VERSION define=BOOST_USE_WINAPI_VERSION=0x0501 --build-type=complete cxxflags="/Zc:threadSafeInit-" define=BOOST_UUID_NO_SIMD --stagedir=lib-14.1\x32 stage - rmdir /S /Q bin.v2 Index: tools/boost-build64.bat =================================================================== diff -u -N -r2e4eacb299f21d06196fe13140b4b0d095abdca9 -r4635360505e8d113395dc8cc394dfb696747e197 --- tools/boost-build64.bat (.../boost-build64.bat) (revision 2e4eacb299f21d06196fe13140b4b0d095abdca9) +++ tools/boost-build64.bat (.../boost-build64.bat) (revision 4635360505e8d113395dc8cc394dfb696747e197) @@ -1,14 +1,6 @@ -rem This scripts updates the environment (that needs to be previously set up for building with vcvarsall) -rem so that the boost will build with xp compatibility in VS2017. rem Execute this script in the boost directory. setlocal -set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE% -set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Bin;%PATH% -set CL=/D_USING_V110_SDK71_;%CL% -set LIB=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Lib\x64;%LIB% -set LINK=/SUBSYSTEM:CONSOLE,5.02 %LINK% +b2 -j 8 --toolset=msvc-14.2 --link=static --threading=multi --runtime-link=shared address-model=64 define=_BIND_TO_CURRENT_VCLIBS_VERSION define=BOOST_USE_WINAPI_VERSION=0x0601 --build-type=complete --stagedir=lib-14.2\x64 stage -b2 -j 8 --toolset=msvc-14.1 --link=static --threading=multi --runtime-link=shared address-model=64 define=_BIND_TO_CURRENT_VCLIBS_VERSION define=BOOST_USE_WINAPI_VERSION=0x0501 --build-type=complete cxxflags="/Zc:threadSafeInit-" --stagedir=lib-14.1\x64 stage - rmdir /S /Q bin.v2