[PATCH 2/4] shlwapi: Correct return value of StrRetToBuf on an invalid type.

[Alex Henrie]

From: Alex Henrie

---
 dlls/shlwapi/string.c       | 8 ++++----
 dlls/shlwapi/tests/string.c | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 37d4d526fb6..4bf95f98170 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -231,8 +231,8 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U
        break;

default:
-	    FIXME("unknown type!\n");
-	    return E_NOTIMPL;
+	    WARN("unknown type!\n");
+	    return E_FAIL;
    }
    return S_OK;
 }
@@ -290,8 +290,8 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest,
         break;

default:
-        FIXME("unknown type!\n");
-        return E_NOTIMPL;
+        WARN("unknown type!\n");
+        return E_FAIL;
     }

return S_OK;
diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index 19430f27296..8fa0b0534cb 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -1150,6 +1150,12 @@ if (0)
         hres = pStrRetToBufW(&strret, NULL, wbuf, 10);
         ok(hres == E_FAIL, "StrRetToBufW returned %08lx\n", hres);
         ok(!wbuf[0], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf));
+
+        memset(wbuf, 0xbf, sizeof(wbuf));
+        strret.uType = 3;
+        hres = pStrRetToBufW(&strret, NULL, wbuf, 10);
+        ok(hres == E_FAIL, "StrRetToBufW returned %08lx\n", hres);
+        ok(!wbuf[0], "StrRetToBuf returned %s\n", wine_dbgstr_w(wbuf));
     }
     else
         win_skip("StrRetToBufW() is not available\n");