[ros-diffs] [gedmurphy] 28324: - fix the code, untested *note, shouldn't this be in rosapps?

Author: gedmurphy
Date: Tue Aug 14 00:52:47 2007
New Revision: 28324

URL: http://svn.reactos.org/svn/reactos?rev=28324&view=rev
Log:
- fix the code, untested
*note, shouldn't this be in rosapps?

Modified:
    trunk/reactos/base/applications/network/dwnl/dwnl.c
    trunk/reactos/base/applications/network/dwnl/dwnl.rbuild

Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/dwnl/dwnl.c (original)
+++ trunk/reactos/base/applications/network/dwnl/dwnl.c Tue Aug 14 00:52:47 2007
@@ -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;
 }

Modified: trunk/reactos/base/applications/network/dwnl/dwnl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/dwnl/dwnl.rbuild (original)
+++ trunk/reactos/base/applications/network/dwnl/dwnl.rbuild Tue Aug 14 00:52:47 2007
@@ -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>