Added CoInternetParseUrl implementation.

dlls/urlmon/Makefile.in

@@ -10,6 +10,7 @@ EXTRALIBS = -luuid
 C_SRCS = \
 	file.c \
 	format.c \
+	internet.c \
 	regsvr.c \
 	sec_mgr.c \
 	umon.c \

dlls/urlmon/internet.c

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2005 Jacek Caban
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "ole2.h"
+#include "urlmon.h"
+#include "urlmon_main.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
+
+static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize)
+{
+    WCHAR *ptr;
+    DWORD len = 0;
+
+    TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
+
+    if(flags)
+        ERR("wrong flags\n");
+    
+    ptr = strchrW(url, ':');
+    if(ptr)
+        len = ptr-url;
+
+    if(len >= size)
+        return E_POINTER;
+
+    if(len)
+        memcpy(result, url, len*sizeof(WCHAR));
+    result[len] = 0;
+
+    if(rsize)
+        *rsize = len;
+
+    return S_OK;
+}
+
+static IInternetProtocolInfo *get_protocol_info(LPCWSTR url)
+{
+    IInternetProtocolInfo *ret = NULL;
+    WCHAR schema[64], str_clsid[64];
+    HKEY hkey = NULL;
+    DWORD res, type, size, schema_len;
+    CLSID clsid;
+    LPWSTR wszKey;
+    HRESULT hres;
+
+    static const WCHAR wszProtocolsKey[] =
+        {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\\'};
+    static const WCHAR wszCLSID[] = {'C','L','S','I','D',0};
+
+    hres = parse_schema(url, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len);
+    if(FAILED(hres) || !schema_len)
+        return NULL;
+
+    wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR));
+    memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey));
+    memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR));
+
+    res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey);
+    HeapFree(GetProcessHeap(), 0, wszKey);
+    if(res != ERROR_SUCCESS) {
+        ERR("Could not open key %s\n", debugstr_w(wszProtocolsKey));
+        return NULL;
+    }
+    
+    size = sizeof(str_clsid);
+    res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size);
+    RegCloseKey(hkey);
+    if(res != ERROR_SUCCESS || type != REG_SZ) {
+        WARN("Could not get protocol CLSID res=%ld\n", res);
+        return NULL;
+    }
+
+    hres = CLSIDFromString(str_clsid, &clsid);
+    if(FAILED(hres)) {
+        WARN("CLSIDFromString failed: %08lx\n", hres);
+        return NULL;
+    }
+
+    CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IInternetProtocolInfo, (void**)&ret);
+    return ret;
+}
+
+static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize)
+{
+    IInternetProtocolInfo *protocol_info;
+    DWORD prsize;
+    HRESULT hres;
+
+    TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
+
+    protocol_info = get_protocol_info(url);
+
+    if(protocol_info) {
+        hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_ENCODE,
+                flags, result, size, rsize, 0);
+        if(SUCCEEDED(hres))
+            return hres;
+    }
+
+    prsize = size;
+    hres = UrlUnescapeW((LPWSTR)url, result, &prsize, flags);
+
+    if(rsize)
+        *rsize = prsize;
+
+    return hres;
+}
+
+HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD dwFlags,
+        LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved)
+{
+    if(dwReserved)
+        WARN("dwReserved = %ld\n", dwReserved);
+
+    switch(ParseAction) {
+    case PARSE_ENCODE:
+        return parse_encode(pwzUrl, dwFlags, pszResult, cchResult, pcchResult);
+    case PARSE_SCHEMA:
+        return parse_schema(pwzUrl, dwFlags, pszResult, cchResult, pcchResult);
+    default:
+        FIXME("not supported action %d\n", ParseAction);
+    }
+
+    return E_NOTIMPL;
+}

dlls/urlmon/tests/misc.c

@@ -202,8 +202,66 @@ static void test_RegisterFormatEnumerator(void)
     IBindCtx_Release(bctx);
 }
 
+static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l',
+        '/','b','l','a','n','k','.','h','t','m',0};
+static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0};
+static const WCHAR url3[] = {'f','i','l','e',':','c',':','\\','I','n','d','e','x','.','h','t','m',0};
+static const WCHAR url4[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e',
+        '%','2','E','j','p','g',0};
+
+static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e',
+        '.','j','p','g',0};
+
+static const WCHAR wszRes[] = {'r','e','s',0};
+static const WCHAR wszFile[] = {'f','i','l','e',0};
+static const WCHAR wszEmpty[] = {0};
+
+struct parse_test {
+    LPCWSTR url;
+    LPCWSTR encoded_url;
+    LPCWSTR schema;
+};
+
+static const struct parse_test parse_tests[] = {
+    {url1,  url1,   wszRes},
+    {url2,  url2,   wszEmpty},
+    {url3,  url3,   wszFile},
+    {url4,  url4e,  wszFile}
+};
+
+static void test_CoInternetParseUrl(void)
+{
+    HRESULT hres;
+    DWORD size;
+    int i;
+
+    static WCHAR buf[4096];
+
+    memset(buf, 0xf0, sizeof(buf));
+    hres = CoInternetParseUrl(parse_tests[0].url, PARSE_SCHEMA, 0, buf,
+            3, &size, 0);
+    ok(hres == E_POINTER, "schema failed: %08lx, expected E_POINTER\n", hres);
+
+    for(i=0; i < sizeof(parse_tests)/sizeof(parse_tests[0]); i++) {
+        memset(buf, 0xf0, sizeof(buf));
+        hres = CoInternetParseUrl(parse_tests[i].url, PARSE_ENCODE, 0, buf,
+                sizeof(buf)/sizeof(WCHAR), &size, 0);
+        ok(hres == S_OK, "[%d] encoding failed: %08lx\n", i, hres);
+        ok(size == lstrlenW(parse_tests[i].encoded_url), "[%d] wrong size\n", i);
+        ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i);
+
+        memset(buf, 0xf0, sizeof(buf));
+        hres = CoInternetParseUrl(parse_tests[i].url, PARSE_SCHEMA, 0, buf,
+                sizeof(buf)/sizeof(WCHAR), &size, 0);
+        ok(hres == S_OK, "[%d] schema failed: %08lx\n", i, hres);
+        ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i);
+        ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i);
+    }
+}
+
 START_TEST(misc)
 {
     test_CreateFormatEnum();
     test_RegisterFormatEnumerator();
+    test_CoInternetParseUrl();
 }

dlls/urlmon/urlmon.spec

@@ -17,7 +17,7 @@
 @ stub CoInternetGetProtocolFlags
 @ stub CoInternetGetSecurityUrl
 @ stdcall CoInternetGetSession(long ptr long)
-@ stub CoInternetParseUrl
+@ stdcall CoInternetParseUrl(wstr long long wstr long ptr long)
 @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)
 @ stub CompareSecurityIds
 @ stub CopyBindInfo