Module: wine Branch: master Commit: 8d7fe3711b4863dc1bbfc03cb516acd44df862d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7fe3711b4863dc1bbfc03cb5...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Sep 20 11:55:34 2011 +0200
wshom.ocx: Added WshShell class factory implementation.
---
.gitignore | 1 + dlls/wshom.ocx/Makefile.in | 2 + dlls/wshom.ocx/shell.c | 29 +++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 66 ++++++++++++++++++++++++++++++++++----- dlls/wshom.ocx/wshom_private.h | 27 ++++++++++++++++ 5 files changed, 116 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore index b9a7636..8474c43 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ dlls/vbscript/vbscript_classes.h dlls/vbscript/vbsglobal.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wshom.ocx/wshom.h include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 5fb73d5..879cc70 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,10 +1,12 @@ MODULE = wshom.ocx
C_SRCS = \ + shell.c \ wshom_main.c
RC_SRCS = wshom.rc
+IDL_H_SRCS = wshom.idl IDL_TLB_SRCS = wshom.idl
@MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c new file mode 100644 index 0000000..598ca9a --- /dev/null +++ b/dlls/wshom.ocx/shell.c @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wshom_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0266822..2e6016c 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" +#include "initguid.h" +#include "wshom_private.h" +#include "wshom.h" #include "rpcproxy.h"
#include "wine/debug.h" @@ -33,6 +27,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom);
static HINSTANCE wshom_instance;
+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 WshShellFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WshShellFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; + /****************************************************************** * DllMain (wshom.ocx.@) */ @@ -58,6 +101,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_WshShell, rclsid)) { + TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WshShellFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h new file mode 100644 index 0000000..50b84b3 --- /dev/null +++ b/dlls/wshom.ocx/wshom_private.h @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;