[ros-diffs] [pschweitzer] 33552: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader, but it now returns an error message.

[pschweitzer at svn.reactos.org]

Author: pschweitzer
Date: Sat May 17 05:36:13 2008
New Revision: 33552

URL: http://svn.reactos.org/svn/reactos?rev=33552&view=rev
Log:
Synced urlmon.dll with Wine HEAD.
This *does not* fix Downloader, but it now returns an error message.

Modified:
    trunk/reactos/dll/win32/urlmon/file.c
    trunk/reactos/dll/win32/urlmon/urlmon.rbuild

Modified: trunk/reactos/dll/win32/urlmon/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?rev=33552&r1=33551&r2=33552&view=diff
==============================================================================
--- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Sat May 17 05:36:13 2008
@@ -119,6 +119,9 @@
 
     ReleaseBindInfo(&bindinfo);
 
+    if(!szUrl || !*szUrl)
+        return E_INVALIDARG;
+
     if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR)
             || memcmp(szUrl, wszFile, sizeof(wszFile)))
         return MK_E_SYNTAX;
@@ -153,6 +156,9 @@
                 break;
             }
         }
+
+        if(file_name[1] == '|')
+            file_name[1] = ':';
 
         This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL,
                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

Modified: trunk/reactos/dll/win32/urlmon/urlmon.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rbuild?rev=33552&r1=33551&r2=33552&view=diff
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] Sat May 17 05:36:13 2008
@@ -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>