diff options
| author | Wez Furlong <wez@php.net> | 2004-05-04 14:54:01 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-05-04 14:54:01 +0000 |
| commit | c921ceb49c5df9b3ae71d9ef451093e1abbc1720 (patch) | |
| tree | f0b6c8bae667fc39506b7c0fa867df06e549275a /sapi/activescript/php5as_scriptengine.h | |
| parent | d6838a86f355f82dfde3c12253617924d7421896 (diff) | |
| download | php-git-c921ceb49c5df9b3ae71d9ef451093e1abbc1720.tar.gz | |
Improve stability.
Give it a new CLSID and change the engine name to ActivePHP5.
Globals registered by the scripting host are now auto-globals and don't
need to be declared global when accessed from within functions.
Diffstat (limited to 'sapi/activescript/php5as_scriptengine.h')
| -rw-r--r-- | sapi/activescript/php5as_scriptengine.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/sapi/activescript/php5as_scriptengine.h b/sapi/activescript/php5as_scriptengine.h index fd5fd522a8..6e9a06ff46 100644 --- a/sapi/activescript/php5as_scriptengine.h +++ b/sapi/activescript/php5as_scriptengine.h @@ -18,6 +18,7 @@ /* $Id$ */ #include <activscp.h> +#include <objsafe.h> #include "zend.h" #include <setjmp.h> @@ -106,6 +107,9 @@ class TPHPScriptingEngine: public IActiveScript, public IActiveScriptParse, public IActiveScriptParseProcedure +#if ACTIVEPHP_OBJECT_SAFETY + , public IObjectSafety +#endif { public: volatile LONG m_refcount; @@ -227,6 +231,20 @@ public: /* IActiveScriptParseProcedure */ /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, /* [out] */ IDispatch **ppdisp); + +#if ACTIVEPHP_OBJECT_SAFETY +public: /* IObjectSafety */ + STDMETHODIMP GetInterfaceSafetyOptions( + /* [in] */ REFIID riid, // Interface that we want options for + /* [out] */ DWORD *pdwSupportedOptions, // Options meaningful on this interface + /* [out] */ DWORD *pdwEnabledOptions); // current option values on this interface + + STDMETHODIMP SetInterfaceSafetyOptions( + /* [in] */ REFIID riid, // Interface to set options for + /* [in] */ DWORD dwOptionSetMask, // Options to change + /* [in] */ DWORD dwEnabledOptions); // New option values +#endif + public: TPHPScriptingEngine(); ~TPHPScriptingEngine(); |