ntdll: Fix 64 bit issue within NTDLL_mergesort().

Marcus Meissner marcus at jet.franken.de
Sat Oct 2 03:19:32 CDT 2010


On Sat, Oct 02, 2010 at 12:31:03AM +0200, Stefan Oberhumer wrote:
> ---
>  dlls/ntdll/misc.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 

What is the alleged 64bit problem here?

left and right are indexes, not sizes actually.

Ciao, Marcus


> diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
> index 2d7c0a7..39b0ad3 100644
> --- a/dlls/ntdll/misc.c
> +++ b/dlls/ntdll/misc.c
> @@ -255,11 +255,11 @@ double CDECL NTDLL_tan( double d )
>  
>  /* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */
>  static void
> -NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *),
> -                 int left, int right )
> +NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *),
> +                 size_t left, size_t right )
>  {
>      if(right>left) {
> -        int i, j, k, m;
> +        size_t i, j, k, m;
>          m=(right+left)/2;
>          NTDLL_mergesort( arr, barr, elemsize, compar, left, m);
>          NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);
> 

> 




More information about the wine-devel mailing list