Re: [PATCH] shell32: handle bad menu handle (Coverity)

2010-01-09 Thread Nikolay Sivov
On 1/9/2010 19:37, Marcus Meissner wrote: +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, 0x4

Re: [PATCH] shell32: handle bad menu handle (Coverity)

2010-01-09 Thread Marcus Meissner
On Sat, Jan 09, 2010 at 07:18:18PM +0300, Nikolay Sivov wrote: > On 1/9/2010 16:59, Marcus Meissner wrote: > >Hi, > > > >handle "invalid menu" return -1. Now with test. > > > >Ciao, Marcus > >--- > > dlls/shell32/shlmenu.c |5 +++-- > > dlls/shell32/tests/shlfileop.c | 13 +++

Re: [PATCH] shell32: handle bad menu handle (Coverity)

2010-01-09 Thread Nikolay Sivov
On 1/9/2010 16:59, Marcus Meissner wrote: Hi, handle "invalid menu" return -1. Now with test. Ciao, Marcus --- dlls/shell32/shlmenu.c |5 +++-- dlls/shell32/tests/shlfileop.c | 13 + 2 files changed, 16 insertions(+), 2 deletions(-) { diff --git a/d

Re: [PATCH] shell32: handle bad menu handle (Coverity)

2010-01-09 Thread Nikolay Sivov
On 1/9/2010 16:59, Marcus Meissner wrote: Hi, handle "invalid menu" return -1. Ciao, Marcus --- dlls/shell32/shlmenu.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) nItem = GetMenuItemCount(hmDst); +if (nItem == -1) + return uIDMax; Hi, Ma

Re: [PATCH 1/2] mmdevapi: Add code to enumerate NOTPRESENT devices

2010-01-09 Thread Maarten Lankhorst
Hi Alexandre, Alexandre Julliard schreef: Maarten Lankhorst writes: @@ -33,6 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); +static const WCHAR software_wine_mmdevapi[] = +{ 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','m','m','d','e','v','a','p','i',0}; Thi

Re: user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified (try2)

2010-01-09 Thread Peter Dons Tychsen
Hello A. I was afraid you were going to say that! :-) My initial change actually did that, but then i ran into the problem that i need the request to fail, but not set an error-code. I could push/pop the current error code in user32 but that seemed a bit ugly. I could also single out that error c