Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 06:38:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updating to new nsString implementation (fix courtesy shaver)

Browse Source
This commit is contained in:
leaf%mozilla.org 1999-06-01 18:06:14 +00:00
parent e8c2c07728
commit 23a15eaea4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webshell/embed/ActiveX/IEHtmlElement.cpp
View File

@ -109,7 +109,7 @@ HRESULT STDMETHODCALLTYPE CIEHtmlElement::getAttribute(BSTR strAttributeName, LO
{
USES_CONVERSION;
AttributeValue->vt = VT_BSTR;
AttributeValue->bstrVal = SysAllocString(W2COLE((const PRUnichar *) szValue));
AttributeValue->bstrVal = SysAllocString(W2COLE(szValue.GetUnicode()));
return S_OK;
}
else
@ -214,7 +214,7 @@ HRESULT STDMETHODCALLTYPE CIEHtmlElement::get_tagName(BSTR __RPC_FAR *p)
pIDOMElement->Release();
USES_CONVERSION;
*p = SysAllocString(W2COLE((const PRUnichar *) szTagName));
*p = SysAllocString(W2COLE(szTagName.GetUnicode()));
return S_OK;
}

4
webshell/embed/ActiveX/MozillaBrowser.cpp
View File

@ -269,7 +269,7 @@ LRESULT CMozillaBrowser::OnViewSource(WORD wNotifyCode, WORD wID, HWND hWndCtl,
if (spOther)
{
// tack in the viewsource command
BSTR bstrURL = SysAllocString(strUrl);
BSTR bstrURL = SysAllocString(strUrl.GetUnicode());
CComVariant vURL(bstrURL);
VARIANT vNull;
vNull.vt = VT_NULL;
@ -926,7 +926,7 @@ HRESULT STDMETHODCALLTYPE CMozillaBrowser::Navigate(BSTR URL, VARIANT __RPC_FAR
// Load the URL
char *tmpCommand = sCommand.ToNewCString();
m_pIWebShell->LoadURL(sUrl, tmpCommand, pIPostData, bModifyHistory);
m_pIWebShell->LoadURL(sUrl.GetUnicode(), tmpCommand, pIPostData, bModifyHistory);
return S_OK;
}