Re: Resend: Fix ole32:moniker test for NT4

[Alexandre Julliard]

Richard Cohen <richard(a)daijobu.co.uk> writes:
> Rediffed against HEAD
>
> Richard Cohen wrote:
> > ... and almost certainly Win9x, 2k, XP
> > Changelog:
> >   + IEnum::Clone shouldn't do a Reset.
> >   + Don't assume the ROT is already empty when testing

The tests fail here:

../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so moniker.c && touch moniker.ok
moniker.c:139: Test failed: Number of matches should be equal to 2 not 0
moniker.c:146: Test failed: Number of matches should be equal to 2 not 0
make[3]: *** [moniker.ok] Error 2

-- 
Alexandre Julliard
julliard(a)winehq.org

Resend: Fix ole32:moniker test for NT4

[Richard Cohen]

Alexandre Julliard wrote:
> Richard Cohen <richard(a)daijobu.co.uk> writes:
> > Rediffed against HEAD
> >
> > Richard Cohen wrote:
> > > ... and almost certainly Win9x, 2k, XP
> > > Changelog:
> > >  + IEnum::Clone shouldn't do a Reset.
> > >  + Don't assume the ROT is already empty when testing
>
> The tests fail here:
>
> ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so moniker.c && touch moniker.ok
> moniker.c:139: Test failed: Number of matches should be equal to 2 not 0
> moniker.c:146: Test failed: Number of matches should be equal to 2 not 0
> make[3]: *** [moniker.ok] Error 2

The patch is correct, and fixes failures on Windows, but the marshalling 
changes have broken it on Wine .

The problem is in FileMoniker::Load/Save. Load() isn't reading back the 
filename correctly. Here's a patch that fixes that. Those functions 
still look rather suspicious in their handling of Unicode file names.

Rob, you were working in this area. Do you want to take it?