From 4fc98cbda826b1c859cbc87bcc7c5cfd83007999 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sat, 17 May 2008 10:36:13 +0000
Subject: [PATCH] Synced urlmon.dll with Wine HEAD. This *does not* fix
 Downloader, but it now returns an error message.

svn path=/trunk/; revision=33552
---
 reactos/dll/win32/urlmon/file.c        | 6 ++++++
 reactos/dll/win32/urlmon/urlmon.rbuild | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/urlmon/file.c b/reactos/dll/win32/urlmon/file.c
index b3691b0ed06..d3004ac6a22 100644
--- a/reactos/dll/win32/urlmon/file.c
+++ b/reactos/dll/win32/urlmon/file.c
@@ -119,6 +119,9 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
 
     ReleaseBindInfo(&bindinfo);
 
+    if(!szUrl || !*szUrl)
+        return E_INVALIDARG;
+
     if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR)
             || memcmp(szUrl, wszFile, sizeof(wszFile)))
         return MK_E_SYNTAX;
@@ -154,6 +157,9 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
             }
         }
 
+        if(file_name[1] == '|')
+            file_name[1] = ':';
+
         This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL,
                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 
diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild
index ad9dcf3a88e..4499c3537dc 100644
--- a/reactos/dll/win32/urlmon/urlmon.rbuild
+++ b/reactos/dll/win32/urlmon/urlmon.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true">
+<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true" entrypoint="0">
 	<autoregister infsection="OleControlDlls" type="Both" />
 	<importlibrary definition="urlmon.spec.def" />
 	<include base="urlmon">.</include>
@@ -28,13 +28,13 @@
 	<file>rsrc.rc</file>
 	<file>urlmon.spec</file>
 	<library>wine</library>
+	<library>uuid</library>
 	<library>ole32</library>
 	<library>shlwapi</library>
 	<library>wininet</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>kernel32</library>
-	<library>uuid</library>
 	<library>ntdll</library>
 </module>
 </group>