From ea8a786bc045f73a7d0e8c7e6b6f7e6f3260f0f4 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Mon, 13 Aug 2007 20:52:47 +0000
Subject: [PATCH] - fix the code, untested *note, shouldn't this be in rosapps?

svn path=/trunk/; revision=28324
---
 reactos/base/applications/network/dwnl/dwnl.c | 42 ++++++++-----------
 .../applications/network/dwnl/dwnl.rbuild     |  3 +-
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/reactos/base/applications/network/dwnl/dwnl.c b/reactos/base/applications/network/dwnl/dwnl.c
index 2880cf46d42..daa1941aed6 100644
--- a/reactos/base/applications/network/dwnl/dwnl.c
+++ b/reactos/base/applications/network/dwnl/dwnl.c
@@ -1,47 +1,41 @@
-#include <windows.h>
+#include <stdio.h>
 #include <urlmon.h>
 #include <tchar.h>
 
-HRESULT WINAPI URLDownloadToFileA(
-        LPUNKNOWN pCaller,
-        LPCSTR szURL,
-        LPCSTR szFileName,
-        DWORD dwReserved,
-        LPBINDSTATUSCALLBACK lpfnCB);
 
 // ToDo: Show status, get file name from webserver, better error reporting
 
-int tmain(int argc, TCHAR **argv)
+int _tmain(int argc, TCHAR **argv)
 {
+	TCHAR* filename = argv[1];
 	int i;
 
 	if(argc != 2)
 	{
-		_tprintf(TEXT("Usage: dwnl <url>"));
+		_tprintf(_T("Usage: dwnl <url>"));
 		return 2;
 	}
 
-	TCHAR* filename = argv[1];
-	for(i=_tcslen(argv[1]);i>0
-		&&filename[i]!='/'
-		&&filename[i]!='\\'
-		&&filename[i]!='?'
-		&&filename[i]!='*'
-		&&filename[i]!=':'
-		&&filename[i]!='\"'
-		&&filename[i]!='<'
-		&&filename[i]!='>'
-		&&filename[i]!='|';i--);
+	for(i=_tcslen(filename);i>0
+		&&filename[i]!=_T('/')
+		&&filename[i]!=_T('\\')
+		&&filename[i]!=_T('?')
+		&&filename[i]!=_T('*')
+		&&filename[i]!=_T(':')
+		&&filename[i]!=_T('\"')
+		&&filename[i]!=_T('<')
+		&&filename[i]!=_T('>')
+		&&filename[i]!=_T('|');i--);
 	filename = &argv[1][i+1];
 
-	_tprintf("Downloading %s... ", filename);
+	_tprintf(_T("Downloading %s... "), filename);
 
-	if(URLDownloadToFileA(NULL, argv[1], filename, 0, NULL) != S_OK)
+	if(URLDownloadToFile(NULL, argv[1], filename, 0, NULL) != S_OK)
 	{
-		_tprintf("Failed.\n");
+		_tprintf(_T("Failed.\n"));
 		return 1;
 	}
 
-	_tprintf("Finished.\n");
+	_tprintf(_T("Finished.\n"));
 	return 0;
 }
diff --git a/reactos/base/applications/network/dwnl/dwnl.rbuild b/reactos/base/applications/network/dwnl/dwnl.rbuild
index 2e8131b2180..c0aab7ad4a6 100644
--- a/reactos/base/applications/network/dwnl/dwnl.rbuild
+++ b/reactos/base/applications/network/dwnl/dwnl.rbuild
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<module name="dwnl" type="win32cui" installbase="system32" installname="dwnl.exe">
+<module name="dwnl" type="win32cui" installbase="system32" installname="dwnl.exe" unicode="yes">
 	<include base="dwnl">.</include>
 	<library>kernel32</library>
-	<library>crtdll</library>
 	<library>urlmon</library>
 	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>