ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Reimplement nsIURL::GetDirectory using new helper functions.

This commit is contained in:
Jacek Caban 2012-01-11 19:41:02 +01:00 committed by Alexandre Julliard
parent 759bad0202
commit 5458e5f6de
1 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
dlls/mshtml/nsio.c
View File

@ -151,6 +151,31 @@ static const char *debugstr_nsacstr(const nsACString *nsstr)
return debugstr_a(data); return debugstr_a(data);
} }
static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int len)
{
char *stra;
int lena;
TRACE("returning %s\n", debugstr_wn(str, len));
if(!*str) {
nsACString_SetData(ret_str, "");
return NS_OK;
}
lena = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL);
stra = heap_alloc(lena+1);
if(!stra)
return NS_ERROR_OUT_OF_MEMORY;
WideCharToMultiByte(CP_ACP, 0, str, len, stra, lena, NULL, NULL);
stra[lena] = 0;
nsACString_SetData(ret_str, stra);
heap_free(stra);
return NS_OK;
}
HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret)
{ {
const WCHAR *ptr = nsuri; const WCHAR *ptr = nsuri;
@ -2543,41 +2568,51 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery)
return NS_OK; return NS_OK;
} }
static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, const WCHAR **ext)
{ {
nsWineURI *This = impl_from_nsIURL(iface); const WCHAR *ptr;
char *dir = NULL;
WCHAR *ptr;
BSTR path;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p)\n", This, aDirectory);
if(!ensure_uri(This)) if(!ensure_uri(This))
return NS_ERROR_UNEXPECTED; return NS_ERROR_UNEXPECTED;
hres = IUri_GetPath(This->uri, &path); hres = IUri_GetPath(This->uri, path);
if(FAILED(hres)) if(FAILED(hres))
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
ptr = strrchrW(path, '/'); for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\\'; ptr--);
if(ptr) { if(*ptr == '/' || *ptr == '\\')
if(ptr[1]) ptr++;
*ptr = 0; *file = ptr;
dir = heap_strdupWtoA(path);
if(!dir) { if(ext) {
SysFreeString(path); ptr = strrchrW(ptr, '.');
return NS_ERROR_OUT_OF_MEMORY; if(!ptr)
} ptr = *path + SysStringLen(*path);
*ext = ptr;
} }
SysFreeString(path);
TRACE("ret %s\n", debugstr_a(dir));
nsACString_SetData(aDirectory, dir ? dir : "");
heap_free(dir);
return NS_OK; return NS_OK;
} }
static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory)
{
nsWineURI *This = impl_from_nsIURL(iface);
const WCHAR *file;
BSTR path;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, aDirectory);
nsres = get_uri_path(This, &path, &file, NULL);
if(NS_FAILED(nsres))
return nsres;
nsres = return_wstr_nsacstr(aDirectory, path, file-path);
SysFreeString(path);
return nsres;
}
static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory) static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory)
{ {
nsWineURI *This = impl_from_nsIURL(iface); nsWineURI *This = impl_from_nsIURL(iface);