ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Handle writing an iconresource entry in SHGetSetFolderCustomSettings. 

Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Louis Lenders 2018-04-30 09:22:42 +02:00 committed by Alexandre Julliard
parent ec55cd694a
commit 730264609f
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/shell32/shlfolder.c
View File

@ -605,14 +605,44 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci
} }
/*********************************************************************** /***********************************************************************
* SHGetSetFolderCustomSettings * SHGetSetFolderCustomSettings (SHELL32.709)
* *
* Only Unicode above Server 2003 * Only Unicode above Server 2003, writes/reads from a Desktop.ini
*/ */
HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag )
{ {
FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0};
return E_NOTIMPL; static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0};
WCHAR bufferW[MAX_PATH];
HRESULT hr;
hr = E_FAIL;
bufferW[0] = 0;
if (!fcs || !path)
return hr;
if (flag & FCS_FORCEWRITE)
{
if (fcs->dwMask & FCSM_ICONFILE)
{
lstrcpyW(bufferW, path);
PathAddBackslashW(bufferW);
lstrcatW(bufferW, desktop_iniW);
if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW))
{
TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW));
hr = S_OK;
}
else
ERR("Failed to write (to) Desktop.ini file\n");
}
}
else
FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag);
return hr;
} }
/*********************************************************************** /***********************************************************************

4
dlls/shell32/tests/shlfolder.c
View File

@ -5278,7 +5278,7 @@ static void test_SHGetSetFolderCustomSettings(void)
fcs.pszIconFile = iconpathW; fcs.pszIconFile = iconpathW;
hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/
todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); ok(hr == S_OK, "Expected S_OK, got %#x\n", hr);
memset(&fcs, 0, sizeof(fcs)); memset(&fcs, 0, sizeof(fcs));
fcs.dwSize = sizeof(fcs); fcs.dwSize = sizeof(fcs);
@ -5292,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void)
todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile));
hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ);
todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr);
lstrcpyW(bufferW, pathW); lstrcpyW(bufferW, pathW);
lstrcatW(bufferW, desktop_iniW); lstrcatW(bufferW, desktop_iniW);