jscript: Added DllCanUnloadNow implementation.
This commit is contained in:
parent
26b38dc503
commit
8d4aa7decf
|
@ -97,8 +97,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface)
|
||||||
|
|
||||||
TRACE("(%p) ref=%d\n", iface, ref);
|
TRACE("(%p) ref=%d\n", iface, ref);
|
||||||
|
|
||||||
if(!ref)
|
if(!ref) {
|
||||||
heap_free(This);
|
heap_free(This);
|
||||||
|
unlock_module();
|
||||||
|
}
|
||||||
|
|
||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
@ -427,6 +429,8 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn
|
||||||
|
|
||||||
TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv);
|
TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv);
|
||||||
|
|
||||||
|
lock_module();
|
||||||
|
|
||||||
ret = heap_alloc(sizeof(*ret));
|
ret = heap_alloc(sizeof(*ret));
|
||||||
|
|
||||||
ret->lpIActiveScriptVtbl = &JScriptVtbl;
|
ret->lpIActiveScriptVtbl = &JScriptVtbl;
|
||||||
|
|
|
@ -28,6 +28,18 @@
|
||||||
|
|
||||||
HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);
|
HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);
|
||||||
|
|
||||||
|
extern LONG module_ref;
|
||||||
|
|
||||||
|
static inline void lock_module(void)
|
||||||
|
{
|
||||||
|
InterlockedIncrement(&module_ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void unlock_module(void)
|
||||||
|
{
|
||||||
|
InterlockedDecrement(&module_ref);
|
||||||
|
}
|
||||||
|
|
||||||
static inline void *heap_alloc(size_t len)
|
static inline void *heap_alloc(size_t len)
|
||||||
{
|
{
|
||||||
return HeapAlloc(GetProcessHeap(), 0, len);
|
return HeapAlloc(GetProcessHeap(), 0, len);
|
||||||
|
|
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
|
WINE_DEFAULT_DEBUG_CHANNEL(jscript);
|
||||||
|
|
||||||
|
LONG module_ref = 0;
|
||||||
|
|
||||||
static const CLSID CLSID_JScript =
|
static const CLSID CLSID_JScript =
|
||||||
{0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}};
|
{0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}};
|
||||||
static const CLSID CLSID_JScriptAuthor =
|
static const CLSID CLSID_JScriptAuthor =
|
||||||
|
@ -75,6 +77,12 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
|
||||||
static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
|
static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
|
||||||
{
|
{
|
||||||
TRACE("(%p)->(%x)\n", iface, fLock);
|
TRACE("(%p)->(%x)\n", iface, fLock);
|
||||||
|
|
||||||
|
if(fLock)
|
||||||
|
lock_module();
|
||||||
|
else
|
||||||
|
unlock_module();
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,8 +135,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
||||||
*/
|
*/
|
||||||
HRESULT WINAPI DllCanUnloadNow(void)
|
HRESULT WINAPI DllCanUnloadNow(void)
|
||||||
{
|
{
|
||||||
FIXME("()\n");
|
TRACE("() ref=%d\n", module_ref);
|
||||||
return S_FALSE;
|
|
||||||
|
return module_ref ? S_FALSE : S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
Loading…
Reference in New Issue