[Wine-devel] Eter's patch is applied to winehq repo 01/19/11
builder на builder.office.etersoft.ru
builder на builder.office.etersoft.ru
Ср Янв 19 21:20:20 MSK 2011
New Etersoft's patches since last build time:
commit 535f0bce59ed55dc4e0511259c7452bf7a9a59a6
Author: Alexander Morozov <amorozov на etersoft.ru>
shell32: Added typelib.
commit 1adbaadc892b0318a80b5e9db7913222217d56a2
Author: Alexander Morozov <amorozov на etersoft.ru>
shell32: Register CLSID_Shell.
commit 8b30849824a6a7bdf454574191729e1ed6f65cbc
Author: Alexander Morozov <amorozov на etersoft.ru>
shell32: Add stub implementation of IShellDispatch.
---
commit 535f0bce59ed55dc4e0511259c7452bf7a9a59a6
Author: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue Jan 18 21:36:08 2011 +0300
shell32: Added typelib.
diff --git a/.gitignore b/.gitignore
index cbc189d..3817eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ dlls/rpcrt4/tests/server_c.c
dlls/rpcrt4/tests/server_s.c
dlls/shdocvw/shdocvw_v1.tlb
dlls/shell32/AUTHORS
+dlls/shell32/shell32_tlb.tlb
dlls/stdole2.tlb/std_ole_v2.tlb
dlls/stdole32.tlb/std_ole_v1.tlb
dlls/sti/sti_wia.h
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 7755111..15cb9d5 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -89,6 +89,8 @@ RC_SRCS = \
PO_SRCS = shell32.rc
+IDL_TLB_SRCS = shell32_tlb.idl
+
SVG_SRCS = \
cdrom.svg \
control.svg \
diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c
index f09d72b..9d3ca65 100644
--- a/dlls/shell32/regsvr.c
+++ b/dlls/shell32/regsvr.c
@@ -22,6 +22,8 @@
#include <string.h>
#include <stdio.h>
+#define COBJMACROS
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
@@ -837,6 +839,8 @@ static struct regsvr_namespace const namespace_extensions_list[] = {
HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr;
+ ITypeLib *tl;
+ static const WCHAR wszShell32[] = { 's','h','e','l','l','3','2','.','d','l','l', 0 };
TRACE("\n");
@@ -847,6 +851,12 @@ HRESULT WINAPI DllRegisterServer(void)
hr = SHELL_RegisterShellFolders();
if (SUCCEEDED(hr))
hr = register_namespace_extensions(namespace_extensions_list);
+ if (SUCCEEDED(hr))
+ {
+ hr = LoadTypeLibEx(wszShell32, REGKIND_REGISTER, &tl);
+ if(SUCCEEDED(hr))
+ ITypeLib_Release(tl);
+ }
return hr;
}
@@ -864,5 +874,8 @@ HRESULT WINAPI DllUnregisterServer(void)
hr = unregister_interfaces(interface_list);
if (SUCCEEDED(hr))
hr = unregister_namespace_extensions(namespace_extensions_list);
+ if (SUCCEEDED(hr))
+ hr = UnRegisterTypeLib(&LIBID_Shell32, 1, 0, LOCALE_SYSTEM_DEFAULT,
+ SYS_WIN32);
return hr;
}
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index bc8e8df..4459be0 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -260,6 +260,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+/* @makedep: shell32_tlb.tlb */
+1 TYPELIB shell32_tlb.tlb
+
shv_accel ACCELERATORS
BEGIN
VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY
diff --git a/dlls/shell32/shell32_tlb.idl b/dlls/shell32/shell32_tlb.idl
new file mode 100644
index 0000000..2b6c719
--- /dev/null
+++ b/dlls/shell32/shell32_tlb.idl
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010 Alexander Morozov for Etersoft
+ *
+ * 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 "shldisp.idl"
commit 1adbaadc892b0318a80b5e9db7913222217d56a2
Author: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue Jan 18 21:35:57 2011 +0300
shell32: Register CLSID_Shell.
diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c
index 9759b00..f09d72b 100644
--- a/dlls/shell32/regsvr.c
+++ b/dlls/shell32/regsvr.c
@@ -75,6 +75,8 @@ struct regsvr_coclass
DWORD dwCallForAttributes;
LPCSTR clsid_str; /* can be NULL to omit */
LPCSTR progid; /* can be NULL to omit */
+ LPCSTR viprogid; /* can be NULL to omit */
+ LPCSTR progid_extra; /* can be NULL to omit */
UINT idDefaultIcon; /* can be 0 to omit */
};
@@ -117,6 +119,8 @@ static WCHAR const ps_clsid32_keyname[17] = {
'i', 'd', '3', '2', 0 };
static WCHAR const clsid_keyname[6] = {
'C', 'L', 'S', 'I', 'D', 0 };
+static WCHAR const curver_keyname[7] = {
+ 'C', 'u', 'r', 'V', 'e', 'r', 0 };
static WCHAR const ips_keyname[13] = {
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
0 };
@@ -125,6 +129,10 @@ static WCHAR const ips32_keyname[15] = {
'3', '2', 0 };
static WCHAR const progid_keyname[7] = {
'P', 'r', 'o', 'g', 'I', 'D', 0 };
+static WCHAR const viprogid_keyname[25] = {
+ 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p',
+ 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D',
+ 0 };
static WCHAR const shellex_keyname[8] = {
's', 'h', 'e', 'l', 'l', 'e', 'x', 0 };
static WCHAR const shellfolder_keyname[12] = {
@@ -150,6 +158,9 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
WCHAR const *value);
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
char const *value);
+static LONG register_progid(WCHAR const *clsid,
+ char const *progid, char const *curver_progid,
+ char const *name, char const *extra);
/***********************************************************************
* register_interfaces
@@ -385,6 +396,16 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list)
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
}
+ if (list->viprogid) {
+ res = register_key_defvalueA(clsid_key, viprogid_keyname,
+ list->viprogid);
+ if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+
+ res = register_progid(buf, list->viprogid, list->progid,
+ list->name, list->progid_extra);
+ if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+ }
+
error_close_clsid_key:
RegCloseKey(clsid_key);
}
@@ -421,6 +442,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
}
+
+ if (list->viprogid) {
+ res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
+ if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
+ if (res != ERROR_SUCCESS) goto error_close_coclass_key;
+ }
}
error_close_coclass_key:
@@ -541,6 +568,55 @@ static LONG register_key_defvalueA(
}
/***********************************************************************
+ * regsvr_progid
+ */
+static LONG register_progid(
+ WCHAR const *clsid,
+ char const *progid,
+ char const *curver_progid,
+ char const *name,
+ char const *extra) {
+ LONG res;
+ HKEY progid_key;
+
+ res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0,
+ NULL, 0, KEY_READ | KEY_WRITE, NULL,
+ &progid_key, NULL);
+ if (res != ERROR_SUCCESS) return res;
+
+ if (name) {
+ res = RegSetValueExA(progid_key, NULL, 0, REG_SZ,
+ (CONST BYTE*)name, strlen(name) + 1);
+ if (res != ERROR_SUCCESS) goto error_close_progid_key;
+ }
+
+ if (clsid) {
+ res = register_key_defvalueW(progid_key, clsid_keyname, clsid);
+ if (res != ERROR_SUCCESS) goto error_close_progid_key;
+ }
+
+ if (curver_progid) {
+ res = register_key_defvalueA(progid_key, curver_keyname,
+ curver_progid);
+ if (res != ERROR_SUCCESS) goto error_close_progid_key;
+ }
+
+ if (extra) {
+ HKEY extra_key;
+
+ res = RegCreateKeyExA(progid_key, extra, 0,
+ NULL, 0, KEY_READ | KEY_WRITE, NULL,
+ &extra_key, NULL);
+ if (res == ERROR_SUCCESS)
+ RegCloseKey(extra_key);
+ }
+
+error_close_progid_key:
+ RegCloseKey(progid_key);
+ return res;
+}
+
+/***********************************************************************
* coclass list
*/
static GUID const CLSID_Desktop = {
@@ -642,6 +718,8 @@ static struct regsvr_coclass const coclass_list[] = {
0,
NULL,
NULL,
+ NULL,
+ NULL,
IDI_SHELL_FULL_RECYCLE_BIN
},
{ &CLSID_ShellFSFolder,
@@ -695,6 +773,19 @@ static struct regsvr_coclass const coclass_list[] = {
"shell32.dll",
"Apartment"
},
+ { &CLSID_Shell,
+ "Shell Automation Service",
+ 0,
+ NULL,
+ "shell32.dll",
+ "Apartment",
+ 0,
+ 0,
+ 0,
+ NULL,
+ "Shell.Application.1",
+ "Shell.Application"
+ },
{ NULL } /* list terminator */
};
commit 8b30849824a6a7bdf454574191729e1ed6f65cbc
Author: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue Jan 18 21:35:41 2011 +0300
shell32: Add stub implementation of IShellDispatch.
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index c6df0e0..7755111 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -27,6 +27,7 @@ C_SRCS = \
recyclebin.c \
regsvr.c \
shell32_main.c \
+ shelldispatch.c \
shellitem.c \
shelllink.c \
shellole.c \
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 77fd42a..02bad8e 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -83,6 +83,7 @@ IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop);
LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER);
HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
+HRESULT WINAPI IShellDispatch_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
HRESULT WINAPI IShellItem_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
HRESULT WINAPI IShellLink_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv);
diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
new file mode 100644
index 0000000..8d71395
--- /dev/null
+++ b/dlls/shell32/shelldispatch.c
@@ -0,0 +1,356 @@
+/*
+ * IShellDispatch implementation
+ *
+ * Copyright 2010 Alexander Morozov for Etersoft
+ *
+ * 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 "config.h"
+#include "wine/port.h"
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+
+#include "shlobj.h"
+#include "shldisp.h"
+#include "debughlp.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+typedef struct {
+ IShellDispatch IShellDispatch_iface;
+ LONG ref;
+} ShellDispatch;
+
+static inline ShellDispatch *impl_from_IShellDispatch(IShellDispatch *iface)
+{
+ return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch_iface);
+}
+
+static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch *iface,
+ REFIID riid, LPVOID *ppv)
+{
+ ShellDispatch *This = impl_from_IShellDispatch(iface);
+
+ TRACE("(%p,%p,%p)\n", iface, riid, ppv);
+
+ if (!ppv) return E_INVALIDARG;
+
+ if (IsEqualIID(&IID_IUnknown, riid) ||
+ IsEqualIID(&IID_IDispatch, riid) ||
+ IsEqualIID(&IID_IShellDispatch, riid))
+ *ppv = This;
+ else
+ {
+ FIXME("not implemented for %s\n", shdebugstr_guid(riid));
+ *ppv = NULL;
+ return E_NOINTERFACE;
+ }
+ IUnknown_AddRef((IUnknown*)*ppv);
+ return S_OK;
+}
+
+static ULONG WINAPI ShellDispatch_AddRef(IShellDispatch *iface)
+{
+ ShellDispatch *This = impl_from_IShellDispatch(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p), new refcount=%i\n", iface, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI ShellDispatch_Release(IShellDispatch *iface)
+{
+ ShellDispatch *This = impl_from_IShellDispatch(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p), new refcount=%i\n", iface, ref);
+
+ if (!ref)
+ HeapFree(GetProcessHeap(), 0, This);
+ return ref;
+}
+
+static HRESULT WINAPI ShellDispatch_GetTypeInfoCount(IShellDispatch *iface,
+ UINT *pctinfo)
+{
+ FIXME("(%p,%p)\n", iface, pctinfo);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_GetTypeInfo(IShellDispatch *iface,
+ UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
+{
+ FIXME("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo);
+
+ *ppTInfo = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_GetIDsOfNames(IShellDispatch *iface,
+ REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+{
+ FIXME("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid,
+ rgDispId);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch *iface,
+ DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags,
+ DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo,
+ UINT *puArgErr)
+{
+ FIXME("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid,
+ wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch *iface,
+ IDispatch **ppid)
+{
+ FIXME("(%p,%p)\n", iface, ppid);
+
+ *ppid = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch *iface,
+ IDispatch **ppid)
+{
+ FIXME("(%p,%p)\n", iface, ppid);
+
+ *ppid = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch *iface,
+ VARIANT vDir, Folder **ppsdf)
+{
+ FIXME("(%p,%p)\n", iface, ppsdf);
+
+ *ppsdf = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch *iface,
+ LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf)
+{
+ FIXME("(%p,%x,%s,%x,%p)\n", iface, Hwnd, debugstr_w(Title), Options, ppsdf);
+
+ *ppsdf = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch *iface,
+ IDispatch **ppid)
+{
+ FIXME("(%p,%p)\n", iface, ppid);
+
+ *ppid = NULL;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Open(IShellDispatch *iface, VARIANT vDir)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Explore(IShellDispatch *iface, VARIANT vDir)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_MinimizeAll(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_UndoMinimizeALL(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_FileRun(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_CascadeWindows(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_TileVertically(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_TileHorizontally(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_ShutdownWindows(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Suspend(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_EjectPC(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_SetTime(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_TrayProperties(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_Help(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_FindFiles(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_FindComputer(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_RefreshMenu(IShellDispatch *iface)
+{
+ FIXME("(%p)\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ShellDispatch_ControlPanelItem(IShellDispatch *iface,
+ BSTR szDir)
+{
+ FIXME("(%p,%s)\n", iface, debugstr_w(szDir));
+
+ return E_NOTIMPL;
+}
+
+static const IShellDispatchVtbl ShellDispatch_Vtbl = {
+ ShellDispatch_QueryInterface,
+ ShellDispatch_AddRef,
+ ShellDispatch_Release,
+ ShellDispatch_GetTypeInfoCount,
+ ShellDispatch_GetTypeInfo,
+ ShellDispatch_GetIDsOfNames,
+ ShellDispatch_Invoke,
+ ShellDispatch_get_Application,
+ ShellDispatch_get_Parent,
+ ShellDispatch_NameSpace,
+ ShellDispatch_BrowseForFolder,
+ ShellDispatch_Windows,
+ ShellDispatch_Open,
+ ShellDispatch_Explore,
+ ShellDispatch_MinimizeAll,
+ ShellDispatch_UndoMinimizeALL,
+ ShellDispatch_FileRun,
+ ShellDispatch_CascadeWindows,
+ ShellDispatch_TileVertically,
+ ShellDispatch_TileHorizontally,
+ ShellDispatch_ShutdownWindows,
+ ShellDispatch_Suspend,
+ ShellDispatch_EjectPC,
+ ShellDispatch_SetTime,
+ ShellDispatch_TrayProperties,
+ ShellDispatch_Help,
+ ShellDispatch_FindFiles,
+ ShellDispatch_FindComputer,
+ ShellDispatch_RefreshMenu,
+ ShellDispatch_ControlPanelItem
+};
+
+HRESULT WINAPI IShellDispatch_Constructor(IUnknown *pUnkOuter, REFIID riid,
+ LPVOID *ppv)
+{
+ ShellDispatch *This;
+ HRESULT ret;
+
+ TRACE("(%p,%s)\n", pUnkOuter, debugstr_guid(riid));
+
+ *ppv = NULL;
+
+ if (pUnkOuter) return CLASS_E_NOAGGREGATION;
+
+ This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellDispatch));
+ if (!This) return E_OUTOFMEMORY;
+ This->IShellDispatch_iface.lpVtbl = &ShellDispatch_Vtbl;
+ This->ref = 1;
+
+ ret = ShellDispatch_QueryInterface(&This->IShellDispatch_iface, riid, ppv);
+ ShellDispatch_Release(&This->IShellDispatch_iface);
+ return ret;
+}
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 41b9711..5940631 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -35,6 +35,7 @@
#include "winuser.h"
#include "shlobj.h"
#include "shlguid.h"
+#include "shldisp.h"
#include "winreg.h"
#include "winerror.h"
@@ -80,6 +81,7 @@ static const struct {
{&CLSID_UnixFolder, UnixFolder_Constructor},
{&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor},
{&CLSID_KnownFolderManager, KnownFolderManager_Constructor},
+ {&CLSID_Shell, IShellDispatch_Constructor},
{NULL, NULL}
};
Подробная информация о списке рассылки Wine-devel