Jacek Caban : urlmon: Fixed handling NULL URLName in GetDisplatName implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 781faa1b9d6fac122ff364f6fcd6b948608c8ac8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=781faa1b9d6fac122ff364f6fc...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Mar 23 18:31:05 2009 +0100

urlmon: Fixed handling NULL URLName in GetDisplatName implementation.

---

 dlls/urlmon/tests/url.c |    6 +++++-
 dlls/urlmon/umon.c      |    3 +++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index f5c553b..a855e1b 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -2574,6 +2574,7 @@ static void test_BindToStorage_fail(void)
 static void test_StdURLMoniker(void)
 {
     IMoniker *mon, *async_mon;
+    LPOLESTR display_name;
     HRESULT hres;
 
     hres = CoCreateInstance(&IID_IInternet, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
@@ -2587,6 +2588,9 @@ static void test_StdURLMoniker(void)
     ok(mon == async_mon, "mon != async_mon\n");
     IMoniker_Release(async_mon);
 
+    hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name);
+    ok(hres == E_OUTOFMEMORY, "GetDisplayName failed: %08x, expected E_OUTOFMEMORY\n", hres);
+
     IMoniker_Release(mon);
 }
 
@@ -2641,7 +2645,7 @@ START_TEST(url)
 
         CoInitialize(NULL);
 
-        trace("test StdURLMoniker...");
+        trace("test StdURLMoniker...\n");
         test_StdURLMoniker();
 
         trace("synchronous http test...\n");
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 0d30765..fe60c75 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -377,6 +377,9 @@ static HRESULT WINAPI URLMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc,
     if(!ppszDisplayName)
         return E_INVALIDARG;
 
+    if(!This->URLName)
+        return E_OUTOFMEMORY;
+
     /* FIXME: If this is a partial URL, try and get a URL moniker from SZ_URLCONTEXT in the bind context,
         then look at pmkToLeft to try and complete the URL
     */