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

shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface.

This commit is contained in:
Thomas Faber 2015-06-27 06:40:11 -04:00 committed by Alexandre Julliard
parent d5c9a8a57a
commit c0cd954f98
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/shfldr_desktop.c
View File

@ -106,6 +106,8 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface(
TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj);
if (!ppvObj) return E_POINTER;
*ppvObj = NULL; *ppvObj = NULL;
if (IsEqualIID (riid, &IID_IUnknown) || if (IsEqualIID (riid, &IID_IUnknown) ||

15
dlls/shell32/tests/shfldr_special.c
View File

@ -224,9 +224,24 @@ if (0)
CoUninitialize(); CoUninitialize();
} }
static void test_desktop_folder(void)
{
IShellFolder *psf;
HRESULT hr;
hr = SHGetDesktopFolder(&psf);
ok(hr == S_OK, "Got %x\n", hr);
hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL);
ok(hr == E_POINTER, "Got %x\n", hr);
IShellFolder_Release(psf);
}
START_TEST(shfldr_special) START_TEST(shfldr_special)
{ {
test_parse_for_entire_network(); test_parse_for_entire_network();
test_parse_for_control_panel(); test_parse_for_control_panel();
test_printers_folder(); test_printers_folder();
test_desktop_folder();
} }