[PATCH] Revert "comctl32: Fix a test on locales where default first day of week is not the max value."

James Hawkins truiken at gmail.com
Thu Oct 9 18:04:29 CDT 2008


On Thu, Oct 9, 2008 at 4:27 PM, Marcus Meissner <marcus at jet.franken.de> wrote:
>
> Hi,
>
> This is breaking my "make test" run for 2 weeks now.
> (LANG=de_DE.utf8)
>
> This reverts commit 2f8830d55b71d2fb8be912c7041d7adab7580391.
> ---
>  dlls/comctl32/tests/monthcal.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
> index 6f2ae70..271dfd1 100644
> --- a/dlls/comctl32/tests/monthcal.c
> +++ b/dlls/comctl32/tests/monthcal.c
> @@ -673,8 +673,7 @@ static void test_monthcal_firstDay(HWND hwnd)
>             if (i == -1){
>                 expect(MAKELONG(fday, FALSE), res);
>             }else if (i >= 7){
> -                /* out of range sets max first day of week, locale is ignored */
> -                expect(MAKELONG(6, TRUE), res);
> +                expect(MAKELONG(fday, TRUE), res);
>             }else{
>                 expect(MAKELONG(i, TRUE), res);
>             }

Reverting a change that makes the tests pass on all platforms is not
the correct fix.  Fixing the implementation to match the tests is the
correct fix.  Please don't apply this.  I've sent a patch that fixes
the problem for other locales.

-- 
James Hawkins



More information about the wine-devel mailing list