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

shell32/tests: Test icon ids that are invalid on all systems.

This commit is contained in:
Nikolay Sivov 2015-09-16 12:43:48 +03:00 committed by Alexandre Julliard
parent 11d0886f04
commit e585d17ff3
2 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/shell32/tests/shelllink.c
View File

@ -993,7 +993,6 @@ static void test_SHGetStockIconInfo(void)
{ {
BYTE buffer[sizeof(SHSTOCKICONINFO) + 16]; BYTE buffer[sizeof(SHSTOCKICONINFO) + 16];
SHSTOCKICONINFO *sii = (SHSTOCKICONINFO *) buffer; SHSTOCKICONINFO *sii = (SHSTOCKICONINFO *) buffer;
BOOL atleast_win7;
HRESULT hr; HRESULT hr;
INT i; INT i;
@ -1007,11 +1006,11 @@ static void test_SHGetStockIconInfo(void)
/* negative values are handled */ /* negative values are handled */
memset(buffer, '#', sizeof(buffer)); memset(buffer, '#', sizeof(buffer));
sii->cbSize = sizeof(SHSTOCKICONINFO); sii->cbSize = sizeof(SHSTOCKICONINFO);
hr = pSHGetStockIconInfo(-1, SHGSI_ICONLOCATION, sii); hr = pSHGetStockIconInfo(SIID_INVALID, SHGSI_ICONLOCATION, sii);
ok(hr == E_INVALIDARG, "-1: got 0x%x (expected E_INVALIDARG)\n", hr); ok(hr == E_INVALIDARG, "-1: got 0x%x (expected E_INVALIDARG)\n", hr);
/* max. id for vista is 140 (no definition exists for this value) */ /* max. id for vista is 140 (no definition exists for this value) */
for (i = 0; i <= 140; i++) for (i = SIID_DOCNOASSOC; i <= SIID_CLUSTEREDDRIVE; i++)
{ {
memset(buffer, '#', sizeof(buffer)); memset(buffer, '#', sizeof(buffer));
sii->cbSize = sizeof(SHSTOCKICONINFO); sii->cbSize = sizeof(SHSTOCKICONINFO);
@ -1026,38 +1025,17 @@ static void test_SHGetStockIconInfo(void)
sii->iIcon, wine_dbgstr_w(sii->szPath)); sii->iIcon, wine_dbgstr_w(sii->szPath));
} }
/* there are more icons since win7 */ /* test invalid icons indices that are invalid for all platforms */
memset(buffer, '#', sizeof(buffer)); for (i = SIID_MAX_ICONS; i < (SIID_MAX_ICONS + 25) ; i++)
sii->cbSize = sizeof(SHSTOCKICONINFO);
hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii);
atleast_win7 = (!hr);
for (; i < (SIID_MAX_ICONS + 25) ; i++)
{ {
memset(buffer, '#', sizeof(buffer)); memset(buffer, '#', sizeof(buffer));
sii->cbSize = sizeof(SHSTOCKICONINFO); sii->cbSize = sizeof(SHSTOCKICONINFO);
hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii); hr = pSHGetStockIconInfo(i, SHGSI_ICONLOCATION, sii);
ok(hr == E_INVALIDARG, "%3d: got 0x%x (expected E_INVALIDARG)\n", i, hr);
if (atleast_win7 && (i == (SIID_MAX_ICONS - 1)) && broken(hr == E_INVALIDARG)) todo_wine {
{ ok(sii->iSysImageIndex == -1, "%d: got iSysImageIndex %d\n", i, sii->iSysImageIndex);
/* Off by one windows bug: there are SIID_MAX_ICONS icons from 0 ok(sii->iIcon == -1, "%d: got iIcon %d\n", i, sii->iIcon);
* up to SIID_MAX_ICONS-1 on Windows 8, but the last one is missing }
* on Windows 7.
*/
trace("%3d: got E_INVALIDARG (windows bug: off by one)\n", i);
}
else if (atleast_win7 && (i < (SIID_MAX_ICONS)))
{
ok(hr == S_OK,
"%3d: got 0x%x, iSysImageIndex: 0x%x, iIcon: 0x%x (expected S_OK)\n",
i, hr, sii->iSysImageIndex, sii->iIcon);
if ((hr == S_OK) && (winetest_debug > 1))
trace("%3d: got iSysImageIndex %3d, iIcon %3d and %s\n", i, sii->iSysImageIndex,
sii->iIcon, wine_dbgstr_w(sii->szPath));
}
else
ok(hr == E_INVALIDARG, "%3d: got 0x%x (expected E_INVALIDARG)\n", i, hr);
} }
/* test more returned SHSTOCKICONINFO elements without extra flags */ /* test more returned SHSTOCKICONINFO elements without extra flags */

4
include/shellapi.h
View File

@ -606,8 +606,8 @@ typedef enum SHSTOCKICONID
SIID_MEDIABDR, SIID_MEDIABDR,
SIID_MEDIABDRE, SIID_MEDIABDRE,
SIID_CLUSTEREDDRIVE, SIID_CLUSTEREDDRIVE,
/* Missing: 141 - 174 */ /* Missing: 141 - 177 */
SIID_MAX_ICONS = 175 SIID_MAX_ICONS = 178
}SHSTOCKICONID; }SHSTOCKICONID;
typedef struct _SHSTOCKICONINFO typedef struct _SHSTOCKICONINFO