Andrew Eikum : shlwapi: Be less strict on which type of IShellFolder can be enumerated.
Alexandre Julliard
julliard at winehq.org
Wed Jul 21 10:54:47 CDT 2010
Module: wine
Branch: master
Commit: d6a827d083157605a6f145773ddd85db0226e562
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a827d083157605a6f145773ddd85db0226e562
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Tue Jul 20 14:54:12 2010 -0500
shlwapi: Be less strict on which type of IShellFolder can be enumerated.
---
dlls/shlwapi/ordinal.c | 29 +++-----
dlls/shlwapi/tests/Makefile.in | 2 +-
dlls/shlwapi/tests/ordinal.c | 150 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+), 18 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 5f332f3..7c00669 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -3694,24 +3694,19 @@ BOOL WINAPI GetOpenFileNameWrapW(LPOPENFILENAMEW ofn)
*/
HRESULT WINAPI SHIShellFolder_EnumObjects(LPSHELLFOLDER lpFolder, HWND hwnd, SHCONTF flags, IEnumIDList **ppenum)
{
- IPersist *persist;
- HRESULT hr;
+ /* Windows attempts to get an IPersist interface and, if that fails, an
+ * IPersistFolder interface on the folder passed-in here. If one of those
+ * interfaces is available, it then calls GetClassID on the folder... and
+ * then calls IShellFolder_EnumObjects no matter what, even crashing if
+ * lpFolder isn't actually an IShellFolder object. The purpose of getting
+ * the ClassID is unknown, so we don't do it here.
+ *
+ * For discussion and detailed tests, see:
+ * "shlwapi: Be less strict on which type of IShellFolder can be enumerated"
+ * wine-devel mailing list, 3 Jun 2010
+ */
- hr = IShellFolder_QueryInterface(lpFolder, &IID_IPersist, (LPVOID)&persist);
- if(SUCCEEDED(hr))
- {
- CLSID clsid;
- hr = IPersist_GetClassID(persist, &clsid);
- if(SUCCEEDED(hr))
- {
- if(IsEqualCLSID(&clsid, &CLSID_ShellFSFolder))
- hr = IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum);
- else
- hr = E_FAIL;
- }
- IPersist_Release(persist);
- }
- return hr;
+ return IShellFolder_EnumObjects(lpFolder, hwnd, flags, ppenum);
}
/* INTERNAL: Map from HLS color space to RGB */
diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in
index 038d76c..1e5cb5e 100644
--- a/dlls/shlwapi/tests/Makefile.in
+++ b/dlls/shlwapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = shlwapi.dll
-IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 kernel32
+IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 kernel32
C_SRCS = \
assoc.c \
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index c8cfcfc..4b1690a 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -31,6 +31,7 @@
#include "shlwapi.h"
#include "docobj.h"
#include "shobjidl.h"
+#include "shlobj.h"
/* Function ptrs for ordinal calls */
static HMODULE hShlwapi;
@@ -56,6 +57,7 @@ static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *);
static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*);
static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*);
static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR);
+static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**);
static HMODULE hmlang;
static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT);
@@ -2370,6 +2372,152 @@ static void test_SHCreateWorkerWindowA(void)
DestroyWindow(hwnd);
}
+static HRESULT WINAPI SF_QueryInterface(IShellFolder *iface,
+ REFIID riid, void **ppv)
+{
+ /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */
+ ok(!IsEqualGUID(&IID_IShellFolder, riid),
+ "Unexpected QI for IShellFolder\n");
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI SF_AddRef(IShellFolder *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI SF_Release(IShellFolder *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI SF_ParseDisplayName(IShellFolder *iface,
+ HWND owner, LPBC reserved, LPOLESTR displayName, ULONG *eaten,
+ LPITEMIDLIST *idl, ULONG *attr)
+{
+ ok(0, "Didn't expect ParseDisplayName\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_EnumObjects(IShellFolder *iface,
+ HWND owner, SHCONTF flags, IEnumIDList **enm)
+{
+ *enm = (IEnumIDList*)0xcafebabe;
+ return S_OK;
+}
+
+static HRESULT WINAPI SF_BindToObject(IShellFolder *iface,
+ LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj)
+{
+ ok(0, "Didn't expect BindToObject\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_BindToStorage(IShellFolder *iface,
+ LPCITEMIDLIST idl, LPBC reserved, REFIID riid, void **obj)
+{
+ ok(0, "Didn't expect BindToStorage\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_CompareIDs(IShellFolder *iface,
+ LPARAM lparam, LPCITEMIDLIST idl1, LPCITEMIDLIST idl2)
+{
+ ok(0, "Didn't expect CompareIDs\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_CreateViewObject(IShellFolder *iface,
+ HWND owner, REFIID riid, void **out)
+{
+ ok(0, "Didn't expect CreateViewObject\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_GetAttributesOf(IShellFolder *iface,
+ UINT cidl, LPCITEMIDLIST *idl, SFGAOF *inOut)
+{
+ ok(0, "Didn't expect GetAttributesOf\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_GetUIObjectOf(IShellFolder *iface,
+ HWND owner, UINT cidl, LPCITEMIDLIST *idls, REFIID riid, UINT *inOut,
+ void **out)
+{
+ ok(0, "Didn't expect GetUIObjectOf\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_GetDisplayNameOf(IShellFolder *iface,
+ LPCITEMIDLIST idl, SHGDNF flags, STRRET *name)
+{
+ ok(0, "Didn't expect GetDisplayNameOf\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI SF_SetNameOf(IShellFolder *iface,
+ HWND hwnd, LPCITEMIDLIST idl, LPCOLESTR name, SHGDNF flags,
+ LPITEMIDLIST *idlOut)
+{
+ ok(0, "Didn't expect SetNameOf\n");
+ return E_NOTIMPL;
+}
+
+static IShellFolderVtbl ShellFolderVtbl = {
+ SF_QueryInterface,
+ SF_AddRef,
+ SF_Release,
+ SF_ParseDisplayName,
+ SF_EnumObjects,
+ SF_BindToObject,
+ SF_BindToStorage,
+ SF_CompareIDs,
+ SF_CreateViewObject,
+ SF_GetAttributesOf,
+ SF_GetUIObjectOf,
+ SF_GetDisplayNameOf,
+ SF_SetNameOf
+};
+
+static IShellFolder ShellFolder = { &ShellFolderVtbl };
+
+static void test_SHIShellFolder_EnumObjects(void)
+{
+ IEnumIDList *enm;
+ HRESULT hres;
+ IShellFolder *folder;
+
+ if(!pSHIShellFolder_EnumObjects || is_win2k_and_lower){
+ win_skip("SHIShellFolder_EnumObjects not available\n");
+ return;
+ }
+
+ if(0){
+ /* NULL object crashes on Windows */
+ hres = pSHIShellFolder_EnumObjects(NULL, NULL, 0, NULL);
+ }
+
+ /* SHIShellFolder_EnumObjects doesn't QI the object for IShellFolder */
+ enm = (IEnumIDList*)0xdeadbeef;
+ hres = pSHIShellFolder_EnumObjects(&ShellFolder, NULL, 0, &enm);
+ ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres);
+ ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm);
+
+ /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */
+ hres = SHGetDesktopFolder(&folder);
+ ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres);
+
+ enm = NULL;
+ hres = pSHIShellFolder_EnumObjects(folder, NULL, 0, &enm);
+ ok(hres == S_OK, "SHIShellFolder_EnumObjects failed: 0x%08x\n", hres);
+ ok(enm != NULL, "Didn't get an enumerator\n");
+ if(enm)
+ IEnumIDList_Release(enm);
+
+ IShellFolder_Release(folder);
+}
+
static void init_pointers(void)
{
#define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord)))
@@ -2388,6 +2536,7 @@ static void init_pointers(void)
MAKEFUNC(IConnectionPoint_SimpleInvoke, 284);
MAKEFUNC(SHFormatDateTimeA, 353);
MAKEFUNC(SHFormatDateTimeW, 354);
+ MAKEFUNC(SHIShellFolder_EnumObjects, 404);
MAKEFUNC(SHGetObjectCompatFlags, 476);
MAKEFUNC(IUnknown_QueryServiceExec, 484);
MAKEFUNC(SHPropertyBag_ReadLONG, 496);
@@ -2420,4 +2569,5 @@ START_TEST(ordinal)
test_IUnknown_QueryServiceExec();
test_IUnknown_ProfferService();
test_SHCreateWorkerWindowA();
+ test_SHIShellFolder_EnumObjects();
}
More information about the wine-cvs
mailing list