“Tokyo” is out, check it now!

Mercury13 · Mercury13 · commit 24da1b9617cc · 2017-11-03T17:21:11.000+02:00
diff --git a/Examples/Easy_Http/AplusB_Get/AplusB_Get.dproj b/Examples/Easy_Http/AplusB_Get/AplusB_Get.dproj
@@ -6,7 +6,7 @@
         <MainSource>AplusB_Get.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/AplusB_Post/AplusB_Post.dproj b/Examples/Easy_Http/AplusB_Post/AplusB_Post.dproj
@@ -6,7 +6,7 @@
         <MainSource>AplusB_Post.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/FileDownloader/ProgressBar.dproj b/Examples/Easy_Http/FileDownloader/ProgressBar.dproj
@@ -6,7 +6,7 @@
         <MainSource>ProgressBar.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/Https/Https.dproj b/Examples/Easy_Http/Https/Https.dproj
@@ -6,7 +6,7 @@
         <MainSource>Https.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/PhotoInfo/PhotoInfo.dproj b/Examples/Easy_Http/PhotoInfo/PhotoInfo.dproj
@@ -6,7 +6,7 @@
         <MainSource>PhotoInfo.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/Readme/Readme.dproj b/Examples/Easy_Http/Readme/Readme.dproj
@@ -6,8 +6,8 @@
         <MainSource>Readme.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -82,6 +82,9 @@
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_UsePackage>bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;DataSnapProviderClient;xmlrtl;DBXSybaseASEDriver;DbxCommonDriver;ibxpress;vclimg;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;MetropolisUILiveTile;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;vclie;vcltouch;DBXDb2Driver;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;fmxase;vcl;IndyCore;DataSnapConnectors;IndyIPCommon;CloudService;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;inet;fmxobj;vclx;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;dbexpress;adortl;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
     </PropertyGroup>
@@ -177,7 +180,7 @@
                 <Platform value="iOSSimulator">False</Platform>
                 <Platform value="OSX32">False</Platform>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
+                <Platform value="Win64">True</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>
diff --git a/Examples/Easy_Http/Readme/Readme.res b/Examples/Easy_Http/Readme/Readme.res
diff --git a/Examples/Easy_Http/Simple/Simple.dproj b/Examples/Easy_Http/Simple/Simple.dproj
@@ -6,7 +6,7 @@
         <MainSource>Simple.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/Examples/Easy_Http/StreamedDl/StreamedDl.dproj b/Examples/Easy_Http/StreamedDl/StreamedDl.dproj
@@ -6,7 +6,7 @@
         <MainSource>StreamedDl.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/Examples/Misc/Version/Version.dproj b/Examples/Misc/Version/Version.dproj
@@ -6,7 +6,7 @@
         <MainSource>Version.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/Examples/Raw_Http/AplusB_Post/AplusB_Post.dproj b/Examples/Raw_Http/AplusB_Post/AplusB_Post.dproj
@@ -6,7 +6,7 @@
         <MainSource>AplusB_Post.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
diff --git a/Examples/Raw_Http/AplusB_Post/f_Main.pas b/Examples/Raw_Http/AplusB_Post/f_Main.pas
@@ -48,7 +48,7 @@ procedure TfmMain.btAddClick(Sender: TObject);
 var
   curl : HCurl;
   post, last : PCurlHttpPost;
-  headers, headersEnd : PCurlSList;
+  headers : PCurlSList;
   code : TCurlCode;
   stream : TRawByteStream;
   effurl : PAnsiChar;
@@ -71,7 +71,7 @@ procedure TfmMain.btAddClick(Sender: TObject);
     curl_easy_setopt(curl, CURLOPT_USERAGENT, FirefoxUserAgent);
     // Set proxy from IE
     curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
-    curl_easy_setopt(curl, CURLOPT_PROXY, ProxyFromIe);
+    curl_easy_setopt(curl, CURLOPT_PROXY, Utf8Encode(ProxyFromIe));
 
     // Show issues of vararg initial
     curl_formadd_initial(post, last,
@@ -93,7 +93,7 @@ procedure TfmMain.btAddClick(Sender: TObject);
     if code = CURLE_OK then begin
       curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, effurl);
       curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, respcode);
-      memoResponse.Text := string(stream.Data) + #13#10#13#10'URL: ' + effurl
+      memoResponse.Text := string(stream.Data) + #13#10#13#10'URL: ' + string(effurl)
           + #10#10'Response code: ' + IntToStr(respcode);
     end else begin
       memoResponse.Text := string(curl_easy_strerror(code));
diff --git a/Examples/Raw_Http/Https/Https.dproj b/Examples/Raw_Http/Https/Https.dproj
@@ -6,7 +6,7 @@
         <MainSource>Https.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/Examples/Raw_Http/Simple/Simple.dproj b/Examples/Raw_Http/Simple/Simple.dproj
@@ -6,7 +6,7 @@
         <MainSource>Simple.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
     </PropertyGroup>
diff --git a/readme.md b/readme.md
@@ -8,6 +8,14 @@ curl4delphi is a simple Delphi XE2+ binding for libcURL.
 My initial version supports “easy” interface only.
 
 
+Note from developer
+===================
+
+Version 0.3 “Tokyo” is out! It is much easier than 0.2.
+
+Check it now, though you can face some incompatibilities with older versions. But I think they are easy to overcome, nothing was changed radically.
+
+
 Quick start
 ===========
 
@@ -29,13 +37,18 @@ Writeln(curl.ResponseBody);
 
 [To use streams for receiving, check `EasyHttp\StreamedDl`].
 
+
 Examples
 ========
 
 ### Misc\Version
 
 Shows version
 
+### RawHttp\Readme
+
+Basic HTTP GET, same as written above.
+
 ### RawHttp\Simple, EasyHttp\Simple
 
 Redirection, basic HTTP GET, GetInfo
@@ -74,6 +87,7 @@ Please copy `php_curl` directory to a PHP-capable web server.
 
 Using ICurlGetBuilder to build a GET URL. Please copy `php_curl` directory to a PHP-capable web server.
 
+
 License
 =======
 MIT for library, public domain for examples.
