Re: [PATCH] msi: Fixed check_flag_combo macro (Coverity)

[Alexandre Julliard]

Marcus Meissner  writes:
> The macro was always FALSE, as
>    x & y == ~y
> is always FALSE. x& y == y was clearly intended.
> CID 1448

It doesn't work here:

../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so action.c && touch action.ok
action.c:5578: Test failed: Expected ERROR_SUCCESS, got 1627
action.c:5587: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
action.c:5599: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
action.c:5656: Test failed: key not created
action.c:5660: Test failed: key not created
action.c:5664: Test failed: key not created
make: *** [action.ok] Error 6

[PATCH] msi: Fixed check_flag_combo macro (Coverity)

[Marcus Meissner]

On Mon, May 09, 2011 at 12:07:39PM +0200, Alexandre Julliard wrote:
> Marcus Meissner  writes:
> > The macro was always FALSE, as
> >    x & y == ~y
> > is always FALSE. x& y == y was clearly intended.
> > CID 1448
>
> It doesn't work here:
>
> ../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so action.c && touch action.ok
> action.c:5578: Test failed: Expected ERROR_SUCCESS, got 1627
> action.c:5587: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
> action.c:5599: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
> action.c:5656: Test failed: key not created
> action.c:5660: Test failed: key not created
> action.c:5664: Test failed: key not created
> make: *** [action.ok] Error 6

I have the suspicion that my patch just uncovers another bug, either
in this specific check, or other code. :/

...
trace:msi:ITERATE_RemoveEnvironmentString name L"=+-MSITESTVAR2" value L"1"
err:msi:env_parse_flags Invalid flags: 00000007
...

Hans? You seem to have added it the remove environment checks in aaf5ff.. any idea?

Ciao, Marcus

[PATCH] msi: Fixed check_flag_combo macro (Coverity)

[Hans Leidekker]

On Mon, 2011-05-09 at 13:05 +0200, Marcus Meissner wrote:
> > It doesn't work here:
> >
> > ../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so action.c && touch action.ok
> > action.c:5578: Test failed: Expected ERROR_SUCCESS, got 1627
> > action.c:5587: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
> > action.c:5599: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0
> > action.c:5656: Test failed: key not created
> > action.c:5660: Test failed: key not created
> > action.c:5664: Test failed: key not created
> > make: *** [action.ok] Error 6
>
> I have the suspicion that my patch just uncovers another bug, either
> in this specific check, or other code. :/
>
> ...
> trace:msi:ITERATE_RemoveEnvironmentString name L"=+-MSITESTVAR2" value L"1"
> err:msi:env_parse_flags Invalid flags: 00000007
> ...
>
> Hans? You seem to have added it the remove environment checks in aaf5ff.. any idea?

ITERATE_RemoveEnvironmentString already validates parsed flags,
so I would move the check_flag_combo invocations from env_parse_flags
to ITERATE_WriteEnvironmentString.