Add support for Unicode IExtractIcon creation in

dlls/shell32/shell32_main.h

@@ -100,6 +100,7 @@ HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid,
 LPENUMIDLIST	IEnumIDList_Constructor(LPCSTR,DWORD,DWORD);
 
 LPEXTRACTICONA	IExtractIconA_Constructor(LPITEMIDLIST);
+LPEXTRACTICONW	IExtractIconW_Constructor(LPITEMIDLIST);
 HRESULT		CreateStreamOnFile (LPCSTR pszFilename, IStream ** ppstm);
 
 /* FIXME: rename the functions when the shell32.dll has it's own exports namespace */

dlls/shell32/shfldr_desktop.c

@@ -408,6 +408,11 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
 	    pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl);
 	    SHFree (pidl);
 	    hr = S_OK;
+	} else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) {
+	    pidl = ILCombine (This->pidlRoot, apidl[0]);
+	    pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl);
+	    SHFree (pidl);
+	    hr = S_OK;
 	} else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) {
 	    hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj);
 	} else {

dlls/shell32/shfldr_fs.c

@@ -559,6 +559,11 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface,
 	    pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl);
 	    SHFree (pidl);
 	    hr = S_OK;
+	} else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) {
+	    pidl = ILCombine (This->pidlRoot, apidl[0]);
+	    pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl);
+	    SHFree (pidl);
+	    hr = S_OK;
 	} else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) {
 	    hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj);
 	} else {

dlls/shell32/shfldr_mycomp.c

@@ -388,6 +388,11 @@ ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
 	    pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl);
 	    SHFree (pidl);
 	    hr = S_OK;
+	} else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) {
+	    pidl = ILCombine (This->pidlRoot, apidl[0]);
+	    pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl);
+	    SHFree (pidl);
+	    hr = S_OK;
 	} else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) {
 	    hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj);
 	} else {