From 8d4aa7decf3c6b7cba9697a09dc3cc44dd71ae05 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 24 Mar 2008 21:53:34 +0100 Subject: [PATCH] jscript: Added DllCanUnloadNow implementation. --- dlls/jscript/jscript.c | 6 +++++- dlls/jscript/jscript.h | 12 ++++++++++++ dlls/jscript/jscript_main.c | 13 +++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 79b55c8e0fb..7d7385a0b1a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -97,8 +97,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); - if(!ref) + if(!ref) { heap_free(This); + unlock_module(); + } return ref; } @@ -427,6 +429,8 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + lock_module(); + ret = heap_alloc(sizeof(*ret)); ret->lpIActiveScriptVtbl = &JScriptVtbl; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6a7ec760955..afdd0c74319 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -28,6 +28,18 @@ 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) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index f4c4bf18a53..92999fbc680 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +LONG module_ref = 0; + static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; 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) { TRACE("(%p)->(%x)\n", iface, fLock); + + if(fLock) + lock_module(); + else + unlock_module(); + return S_OK; } @@ -127,8 +135,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); - return S_FALSE; + TRACE("() ref=%d\n", module_ref); + + return module_ref ? S_FALSE : S_OK; } /***********************************************************************