ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Make NTDLL_mergesort() stable.

This commit is contained in:
Stefan Oberhumer 2010-10-02 00:49:42 +02:00 committed by Alexandre Julliard
parent 98134a8c5a
commit 1d241bb200
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/ntdll/misc.c
View File

@ -270,9 +270,9 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co
for (j=m; j<right; j++) for (j=m; j<right; j++)
memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize);
for (k=left; k<=right; k++) { /* i=left; j=right; */
/*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/ for (k=left; i<=m && j>m; k++) {
if (i != j && compar(X(barr,i),X(barr,j))<0) { if (compar(X(barr,i),X(barr,j))<=0) {
memcpy(X(arr,k),X(barr,i),elemsize); memcpy(X(arr,k),X(barr,i),elemsize);
i++; i++;
} else { } else {
@ -280,6 +280,10 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co
j--; j--;
} }
} }
for (; i<=m; i++, k++)
memcpy(X(arr,k),X(barr,i),elemsize);
for (; j>m; j--, k++)
memcpy(X(arr,k),X(barr,j),elemsize);
} }
#undef X #undef X
} }