Jacek Caban : vbscript: Added VBScript class factory implementation.
Alexandre Julliard
julliard at winehq.org
Tue Jun 21 12:25:43 CDT 2011
Module: wine
Branch: master
Commit: 0ac5c7d5d270c9a7724ab23d933bed1605d5cfb1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac5c7d5d270c9a7724ab23d933bed1605d5cfb1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Jun 21 16:14:37 2011 +0200
vbscript: Added VBScript class factory implementation.
---
.gitignore | 1 +
dlls/vbscript/Makefile.in | 1 +
dlls/vbscript/vbscript_main.c | 63 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6f999e1..aa3abb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,6 +137,7 @@ dlls/sti/sti_wia.h
dlls/sti/sti_wia_p.c
dlls/urlmon/urlmon_urlmon.h
dlls/urlmon/urlmon_urlmon_p.c
+dlls/vbscript/vbscript_classes.h
dlls/windowscodecs/windowscodecs_wincodec.h
dlls/windowscodecs/windowscodecs_wincodec_p.c
dlls/wuapi/wuapi_tlb.tlb
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in
index c319b7d..3e8a3eb 100644
--- a/dlls/vbscript/Makefile.in
+++ b/dlls/vbscript/Makefile.in
@@ -5,6 +5,7 @@ C_SRCS = \
RC_SRCS = vbscript.rc
+IDL_H_SRCS = vbscript_classes.idl
IDL_R_SRCS = vbscript_classes.idl
@MAKE_DLL_RULES@
diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c
index fed2317..ab2d3ef 100644
--- a/dlls/vbscript/vbscript_main.c
+++ b/dlls/vbscript/vbscript_main.c
@@ -24,8 +24,11 @@
#include "windef.h"
#include "winbase.h"
+#include "initguid.h"
+
#include "ole2.h"
#include "rpcproxy.h"
+#include "vbscript_classes.h"
#include "wine/debug.h"
@@ -33,6 +36,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
static HINSTANCE vbscript_hinstance;
+HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv)
+{
+ FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv);
+ return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
+{
+ *ppv = NULL;
+
+ if(IsEqualGUID(&IID_IUnknown, riid)) {
+ TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv);
+ *ppv = iface;
+ }else if(IsEqualGUID(&IID_IClassFactory, riid)) {
+ TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv);
+ *ppv = iface;
+ }
+
+ if(*ppv) {
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
+ }
+
+ FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
+{
+ TRACE("(%p)\n", iface);
+ return 2;
+}
+
+static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
+{
+ TRACE("(%p)\n", iface);
+ return 1;
+}
+
+static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
+{
+ TRACE("(%p)->(%x)\n", iface, fLock);
+ return S_OK;
+}
+
+static const IClassFactoryVtbl VBScriptFactoryVtbl = {
+ ClassFactory_QueryInterface,
+ ClassFactory_AddRef,
+ ClassFactory_Release,
+ VBScriptFactory_CreateInstance,
+ ClassFactory_LockServer
+};
+
+static IClassFactory VBScriptFactory = { &VBScriptFactoryVtbl };
+
/******************************************************************
* DllMain (vbscript.@)
*/
@@ -58,6 +116,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
*/
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
+ if(IsEqualGUID(&CLSID_VBScript, rclsid)) {
+ TRACE("(CLSID_VBScript %s %p)\n", debugstr_guid(riid), ppv);
+ return IClassFactory_QueryInterface(&VBScriptFactory, riid, ppv);
+ }
+
FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
return CLASS_E_CLASSNOTAVAILABLE;
}
More information about the wine-cvs
mailing list