* Moved HttpGetRequest() to Wininet.ew

* Updated HttpGetRequest() to support any size response.
* Updated demo.ex to download files of different sizes.

Author: ghaberek

Wininet.ew

@@ -1,7 +1,9 @@
 
 include std/dll.e
 include std/machine.e
+include std/net/url.e
 include std/types.e
+include euphoria/info.e
 
 public constant
 	INTERNET_INVALID_PORT_NUMBER            = 0,
@@ -78,10 +80,48 @@ public constant
 	INTERNET_SERVICE_HTTP                          = 3,
 $
 
+public constant
+	INTERNET_STATUS_RESOLVING_NAME          =  10,
+	INTERNET_STATUS_NAME_RESOLVED           =  11,
+	INTERNET_STATUS_CONNECTING_TO_SERVER    =  20,
+	INTERNET_STATUS_CONNECTED_TO_SERVER     =  21,
+	INTERNET_STATUS_SENDING_REQUEST         =  30,
+	INTERNET_STATUS_REQUEST_SENT            =  31,
+	INTERNET_STATUS_RECEIVING_RESPONSE      =  40,
+	INTERNET_STATUS_RESPONSE_RECEIVED       =  41,
+	INTERNET_STATUS_CTL_RESPONSE_RECEIVED   =  42,
+	INTERNET_STATUS_PREFETCH                =  43,
+	INTERNET_STATUS_CLOSING_CONNECTION      =  50,
+	INTERNET_STATUS_CONNECTION_CLOSED       =  51,
+	INTERNET_STATUS_HANDLE_CREATED          =  60,
+	INTERNET_STATUS_HANDLE_CLOSING          =  70,
+	INTERNET_STATUS_DETECTING_PROXY         =  80,
+	INTERNET_STATUS_REQUEST_COMPLETE        = 100,
+	INTERNET_STATUS_REDIRECT                = 110,
+	INTERNET_STATUS_INTERMEDIATE_RESPONSE   = 120,
+	INTERNET_STATUS_USER_INPUT_REQUIRED     = 140,
+	INTERNET_STATUS_STATE_CHANGE            = 200,
+	INTERNET_STATUS_COOKIE_SENT             = 320,
+	INTERNET_STATUS_COOKIE_RECEIVED         = 321,
+	INTERNET_STATUS_PRIVACY_IMPACTED        = 324,
+	INTERNET_STATUS_P3P_HEADER              = 325,
+	INTERNET_STATUS_P3P_POLICYREF           = 326,
+	INTERNET_STATUS_COOKIE_HISTORY          = 327,
+$
+
+public constant
+	INTERNET_STATE_CONNECTED            = 0x00000001,
+	INTERNET_STATE_DISCONNECTED         = 0x00000002,
+	INTERNET_STATE_DISCONNECTED_BY_USER = 0x00000010,
+	INTERNET_STATE_IDLE                 = 0x00000100,
+	INTERNET_STATE_BUSY                 = 0x00000200,
+$
+
 public constant ERROR_INSUFFICIENT_BUFFER = 122
 
+public constant AGENT_STRING = "Euphoria/" & version_string_short()
+
 atom Wininet = open_dll( "Wininet.dll" )
-? Wininet
 
 constant
 	C_DWORD_PTR     = C_POINTER,
@@ -101,13 +141,6 @@ constant
 	xInternetReadFile       = define_c_func( Wininet, "InternetReadFile", {C_HINTERNET,C_LPVOID,C_DWORD,C_LPDWORD}, C_BOOL ),
 $
 
-? xHttpOpenRequest
-& xHttpSendRequest
-& xInternetCloseHandle
-& xInternetConnect
-& xInternetOpen
-& xInternetReadFile
-
 function allocate_wstring_pointer_array( object string_list, boolean cleanup = FALSE )
 
 	if atom( string_list ) then return NULL end if
@@ -194,4 +227,44 @@ public function InternetReadFile( atom hFile, atom dwNumberOfBytesToRead = 4096
 	return peek({ lpBuffer, dwNumberOfBytesRead })
 end function
 
+public function HttpGetRequest( sequence url, object accept_types = NULL )
+	
+	atom flags = INTERNET_FLAG_NO_UI
+	atom port = INTERNET_DEFAULT_HTTP_PORT
+	
+	sequence parsed = url:parse( url )
+	
+	if equal( parsed[1], "https" ) then
+		flags += INTERNET_FLAG_SECURE
+		port = INTERNET_DEFAULT_HTTPS_PORT
+	end if
+	
+	if not equal( parsed[3], 0 ) then
+		port = parsed[3]
+	end if
+	
+	atom ih = InternetOpen( AGENT_STRING, INTERNET_OPEN_TYPE_PRECONFIG )
+	atom ch = InternetConnect( ih, parsed[2], port )
+	atom req = HttpOpenRequest( ch, "GET", parsed[4], , , accept_types, flags )
+	
+	sequence buff = {}
+	
+	if HttpSendRequest( req ) then
+		
+		sequence data
+		
+		while length( data ) with entry do
+			buff &= data
+		entry
+			data = InternetReadFile( req )
+		end while
+		
+	end if
+	
+	InternetCloseHandle( req )
+	InternetCloseHandle( ch )
+	InternetCloseHandle( ih )
+	
+	return buff
+end function
 

demo.ex

@@ -1,52 +1,39 @@
 
 include Wininet.ew
-include std/net/url.e
 include std/pretty.e
 
-procedure print_r( object value, sequence name = "", sequence options = {2} )
-	
-	if length( name ) then
-		printf( 1, "%s = ", {name} )
-	end if
-	
-	pretty_print( 1, value, options )
-	puts( 1, "\n" )
-	
-end procedure
+constant UNITS = {"bytes","KiB","MiB"}
 
-public function HttpGetRequest( sequence url )
-	
-	atom flags = INTERNET_FLAG_NO_UI
-	atom port = INTERNET_DEFAULT_HTTP_PORT
+function format_size( atom size )
 
-	sequence parsed = url:parse( url )
+	integer index = 1
 
-	if equal( parsed[1], "https" ) then
-		flags += INTERNET_FLAG_SECURE
-		port = INTERNET_DEFAULT_HTTPS_PORT
-	end if
+	while size > 1024 do
+		size /= 1024
+		index += 1
+	end while
 
-	atom ih = InternetOpen( "Mozilla/4.0 (compatible)", INTERNET_OPEN_TYPE_PRECONFIG )
-	atom ch = InternetConnect( ih, parsed[2], port )
-	atom req = HttpOpenRequest( ch, "GET", parsed[4], , , , flags )
-	
-	object data = {}
+	return sprintf( "%0.2f %s", {size,UNITS[index]} )
+end function
+
+procedure download_file( sequence url )
 
-	if HttpSendRequest( req ) then
-		data = InternetReadFile( req )
-	end if
+	sequence data = HttpGetRequest( url )
+	sequence size = format_size( length(data) )
 
-	InternetCloseHandle( req )
-	InternetCloseHandle( ch )
-	InternetCloseHandle( ih )
+	printf( 1, "%10s %s\n", {size,url} )
 
-	return data
-end function
+end procedure
 
 procedure main()
 
-	object data = HttpGetRequest( "https://myhtf.net/server-ip.txt" )
-	print_r( data, "data" )
+	download_file( "https://openeuphoria.org/index.wc" )
+	download_file( "https://openeuphoria.org/forum/" )
+	download_file( "https://sourceforge.net/projects/rapideuphoria/files/Euphoria/4.0.5/euphoria-4.0.5.pdf" )
+	download_file( "https://sourceforge.net/projects/rapideuphoria/files/Euphoria/4.0.5/euphoria-4.0.5-html.zip" )
+	download_file( "https://sourceforge.net/projects/rapideuphoria/files/Euphoria/4.0.5/euphoria_4.0.5_i386.deb" )
+	download_file( "https://sourceforge.net/projects/rapideuphoria/files/Euphoria/4.0.5/euphoria-4.0.5.exe" )
+	download_file( "https://sourceforge.net/projects/rapideuphoria/files/Euphoria/4.1.0-beta2/euphoria-4.1.0-x86.exe" )
 
 end procedure