shell32: Move the IQueryAssociations implementation from shlwapi to shell32.

dlls/shell32/Makefile.in

@@ -6,10 +6,11 @@ VPATH     = @srcdir@
 MODULE    = shell32.dll
 IMPORTLIB = shell32
 IMPORTS   = uuid shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
-DELAYIMPORTS = ole32 oleaut32 shdocvw
+DELAYIMPORTS = ole32 oleaut32 shdocvw version
 
 C_SRCS = \
 	appbar.c \
+	assoc.c \
 	autocomplete.c \
 	brsfolder.c \
 	changenotify.c \

dlls/shell32/shell32_main.h

@@ -97,6 +97,7 @@ HRESULT WINAPI UnixDosFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO
 HRESULT WINAPI FolderShortcut_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv);
 HRESULT WINAPI MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv);
 HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv);
+HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput);
 extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*);
 HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);
 HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);

dlls/shell32/shellole.c

@@ -74,6 +74,7 @@ static const struct {
 	{&CLSID_FolderShortcut, FolderShortcut_Constructor},
 	{&CLSID_MyDocuments,    MyDocuments_Constructor},
 	{&CLSID_RecycleBin,     RecycleBin_Constructor},
+	{&CLSID_QueryAssociations, QueryAssociations_Constructor},
 	{NULL,NULL}
 };