corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked QueryInterface implementation

Browse Source
This commit is contained in:
locka@iol.ie
1998-12-13 21:41:46 +00:00
parent 76368a2d29
commit 2b97c5b91e
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webshell/embed/ActiveX/WebShellContainer.cpp
View File

@@ -23,6 +23,7 @@
static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID); static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID);
static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID); static NS_DEFINE_IID(kIStreamObserverIID, NS_ISTREAMOBSERVER_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
/* static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); */ /* static NS_DEFINE_IID(kINetSupportIID, NS_INETSUPPORT_IID); */
@@ -51,39 +52,34 @@ NS_IMPL_RELEASE(CWebShellContainer)
nsresult CWebShellContainer::QueryInterface(const nsIID& aIID, void** aInstancePtrResult) nsresult CWebShellContainer::QueryInterface(const nsIID& aIID, void** aInstancePtrResult)
{ {
NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer"); NS_PRECONDITION(nsnull != aInstancePtrResult, "null pointer");
if (nsnull == aInstancePtrResult) { if (nsnull == aInstancePtrResult)
{
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
} }
*aInstancePtrResult = NULL; *aInstancePtrResult = NULL;
/*
if (aIID.Equals(kIBrowserWindowIID)) { if (aIID.Equals(kIStreamObserverIID))
*aInstancePtrResult = (void*) ((nsIBrowserWindow*)this); {
AddRef();
return NS_OK;
} */
if (aIID.Equals(kIStreamObserverIID)) {
*aInstancePtrResult = (void*) ((nsIStreamObserver*)this); *aInstancePtrResult = (void*) ((nsIStreamObserver*)this);
AddRef(); AddRef();
return NS_OK; return NS_OK;
} }
if (aIID.Equals(kIWebShellContainerIID)) { if (aIID.Equals(kIWebShellContainerIID))
{
*aInstancePtrResult = (void*) ((nsIWebShellContainer*)this); *aInstancePtrResult = (void*) ((nsIWebShellContainer*)this);
AddRef(); AddRef();
return NS_OK; return NS_OK;
} }
/* if (aIID.Equals(kINetSupportIID)) {
*aInstancePtrResult = (void*) ((nsINetSupport*)this); if (aIID.Equals(kISupportsIID))
{
*aInstancePtrResult = (void*) ((nsIStreamObserver*)this);
AddRef(); AddRef();
return NS_OK; return NS_OK;
} }
if (aIID.Equals(kISupportsIID)) {
*aInstancePtrResult = (void*) ((nsISupports*)((nsIBrowserWindow*)this));
AddRef();
return NS_OK;
}
*/
return NS_NOINTERFACE; return NS_NOINTERFACE;
} }
@@ -148,6 +144,7 @@ NS_IMETHODIMP
CWebShellContainer::ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aProgress, PRInt32 aProgressMax) CWebShellContainer::ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aProgress, PRInt32 aProgressMax)
{ {
ATLTRACE(_T("CWebShellContainer::ProgressLoadURL()\n")); ATLTRACE(_T("CWebShellContainer::ProgressLoadURL()\n"));
m_pEvents1->Fire_ProgressChange(aProgress, aProgressMax); m_pEvents1->Fire_ProgressChange(aProgress, aProgressMax);
m_pEvents2->Fire_ProgressChange(aProgress, aProgressMax); m_pEvents2->Fire_ProgressChange(aProgress, aProgressMax);
return NS_OK; return NS_OK;