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

shell32: Handle bad menu handle (Coverity).

This commit is contained in:
Marcus Meissner 2010-01-09 14:59:22 +01:00 committed by Alexandre Julliard
parent 9bcb143a40
commit 54aa61798f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/shell32/shlmenu.c
View File

@ -869,10 +869,11 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc)
{ return uIDMax;
}
return uIDMax;
nItem = GetMenuItemCount(hmDst);
if (nItem == -1)
return uIDMax;
if (uInsert >= (UINT)nItem) /* insert position inside menu? */
{

13
dlls/shell32/tests/shlfileop.c
View File

@ -2224,6 +2224,17 @@ static void test_unicode(void)
ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n");
}
extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
static void
test_shlmenu(void) {
HRESULT hres;
hres = Shell_MergeMenus (0, 0, 0x42, 0x4242, 0x424242, 0);
ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres);
hres = Shell_MergeMenus ((HMENU)42, 0, 0x42, 0x4242, 0x424242, 0);
ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres);
}
START_TEST(shlfileop)
{
InitFunctionPointers();
@ -2263,4 +2274,6 @@ START_TEST(shlfileop)
clean_after_shfo_tests();
test_unicode();
test_shlmenu();
}