reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-21 05:11:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

urlmon: Implemented PARSE_URL_FROM_PATH for CoInternetParseIUri.

Browse Source
This commit is contained in:
Thomas Mullaly 2010-12-02 20:58:11 -05:00 committed by Alexandre Julliard
parent 221331e72b
commit 1788099321
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/urlmon/tests/uri.c
View File

@ -5948,7 +5948,15 @@ static const uri_parse_test uri_parse_tests[] = {
{"file:///c:/t<|>est.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\t<|>est.mp3",S_OK,FALSE},
{"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE},
{"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE},
{"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}
{"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE},
/* PARSE_URL_FROM_PATH tests. */
/* This function almost seems to useless (just returns the absolute uri). */
{"test.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"test.com",S_OK,FALSE},
{"/test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"/test/test",S_OK,FALSE},
{"file://c:\\test\\test",Uri_CREATE_FILE_USE_DOS_PATH,PARSE_URL_FROM_PATH,0,"file://c:\\test\\test",S_OK,FALSE},
{"file:c:/test",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE},
{"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}
};
static inline LPWSTR a2w(LPCSTR str) {

32
dlls/urlmon/uri.c
View File

@ -6356,6 +6356,35 @@ static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_l
return S_OK;
}
static HRESULT parse_url_from_path(IUri *uri, LPWSTR output, DWORD output_len,
DWORD *result_len)
{
HRESULT hr;
BSTR received;
DWORD len = 0;
hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_ABSOLUTE_URI, &len, 0);
if(FAILED(hr)) {
*result_len = 0;
return hr;
}
*result_len = len;
if(len+1 > output_len)
return STRSAFE_E_INSUFFICIENT_BUFFER;
hr = IUri_GetAbsoluteUri(uri, &received);
if(FAILED(hr)) {
*result_len = 0;
return hr;
}
memcpy(output, received, (len+1)*sizeof(WCHAR));
SysFreeString(received);
return S_OK;
}
/***********************************************************************
* CoInternetParseIUri (urlmon.@)
*/
@ -6417,6 +6446,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d
}
hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult);
break;
case PARSE_URL_FROM_PATH:
hr = parse_url_from_path(pIUri, pwzResult, cchResult, pcchResult);
break;
case PARSE_SECURITY_URL:
case PARSE_MIME:
case PARSE_SERVER: