Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NOT PART OF BUILD. Corrected scriptability tests.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@133651 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbradley%netscape.com 2002-11-12 10:38:17 +00:00
parent a9d29a14f5
commit 664e4a6037
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/js/src/xpconnect/src/XPCDispObject.cpp
View File

@ -127,7 +127,7 @@ nsresult XPCDispObject::COMCreateInstance(const char * className, PRBool testScr
}
if(FAILED(hr))
return hr;
PRBool scriptableOK = testScriptability;
PRBool scriptableOK = PR_TRUE;
if (testScriptability)
{
const DWORD scriptOk = INTERFACESAFE_FOR_UNTRUSTED_CALLER |
@ -137,12 +137,10 @@ nsresult XPCDispObject::COMCreateInstance(const char * className, PRBool testScr
// Didn't have the safe for scripting category so lets look at IObjectSafety
CComPtr<IDispatch> disp;
if (scriptableOK || !testScriptability)
{
HRESULT hResult = disp.CoCreateInstance(classID);
if (FAILED(hResult))
return hResult;
}
HRESULT hResult = disp.CoCreateInstance(classID);
if (FAILED(hResult))
return hResult;
// If we're testing scriptability and it didn't have a scripting category
// we'll check via the IObjectSafety interface
if (testScriptability && !scriptableOK)