diff -Naur wine-1.1.23-fe.orig/dlls/gdi32/bidi.c wine-1.1.23-fe/dlls/gdi32/bidi.c --- wine-1.1.23-fe.orig/dlls/gdi32/bidi.c 2009-06-05 20:28:43.000000000 +0300 +++ wine-1.1.23-fe/dlls/gdi32/bidi.c 2009-08-23 01:23:41.159078221 +0300 @@ -1043,6 +1043,77 @@ } while (cchPara); } + +#include "mu-utf16.h" + +/************************************************************* + * BIDI_Shaper: based on mu (Muthanna) shaping algorithm by Muayyad alsadi + */ +BOOL BIDI_Shaper(LPWSTR lpString,INT uCount) +{ + LPWSTR p=lpString; + WCHAR c, cn, ch, jx, last=0, jcn, jpc; + unsigned char *joints=HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(unsigned char)); + unsigned char *j=joints; + INT i=0,ix; + /* visual forward */ + for (i=0;i ArabicShapingEnd ) { last=0; *j=0; continue; } + + ix=c-ArabicShapingStart; + jx=ArabicShapingData[ix][1]; + + if (jx & 8) { last=0; *j=0; continue; } + *j= ( last & jx ) & 1; + if (! (jx & 4)) { last=(jx & 2)>>1; } + } + /* visual backward + actual shaping */ + j=joints+uCount-1; + p=lpString+uCount-1; + last=0; + for (i=0;i ArabicShapingEnd ) { last=0; continue; } + + ix=c-ArabicShapingStart; + jx=ArabicShapingData[ix][1]; + + if (jx & 8) { last=0; continue; } + /* handle U+FEFB ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM and alike */ + if ( c == 0x0644 && i < uCount ) { + ch=0; + cn=*(p-1); + if (cn==0x0622) { + ch=0xFEF5; + } else if (cn==0x0623) { + ch=0xFEF7; + } else if (cn==0x0625) { + ch=0xFEF9; + } else if (cn==0x0627) { + ch=0xFEFB; + } + if (ch) { + jpc=( last & ((jx & 2)>>1) ) & 1; + *p=ch+jpc; + last=jx & 1; + ++i;--p;--j; + *p=0x200C; + continue; + } + } + /* the actual shaping */ + jcn=*j; + jpc=( last & ((jx & 2)>>1) ) & 1; + *p=ArabicShapingData[ix][2+(jpc|(jcn<<1))]; + if (! (jx & 4)) { last=jx & 1; } + + } HeapFree(GetProcessHeap(), 0, joints); + return TRUE; +} + /************************************************************* * BIDI_Reorder */ @@ -1168,7 +1239,8 @@ } done += i; } - HeapFree(GetProcessHeap(), 0, chartype); + BIDI_Shaper(lpOutString,uCountOut); return TRUE; } + diff -Naur wine-1.1.23-fe.orig/dlls/gdi32/mu-utf16.h wine-1.1.23-fe/dlls/gdi32/mu-utf16.h --- wine-1.1.23-fe.orig/dlls/gdi32/mu-utf16.h 1970-01-01 02:00:00.000000000 +0200 +++ wine-1.1.23-fe/dlls/gdi32/mu-utf16.h 2009-08-22 18:48:50.829399000 +0300 @@ -0,0 +1,221 @@ +static const WCHAR ArabicShapingData[][6] = { + { 0x622, 2, 0xfe81, 0xfe82, 0xfe81, 0xfe81 }, + { 0x623, 2, 0xfe83, 0xfe84, 0xfe83, 0xfe84 }, + { 0x624, 2, 0xfe85, 0xfe86, 0x624, 0x624 }, + { 0x625, 2, 0xfe87, 0xfe88, 0xfe87, 0xfe88 }, + { 0x626, 3, 0xfe89, 0xfe8a, 0xfe8b, 0xfe8c }, + { 0x627, 2, 0xfe8d, 0xfe8e, 0xfe8d, 0xfe8e }, + { 0x628, 3, 0xfe8f, 0xfe90, 0xfe91, 0xfe92 }, + { 0x629, 2, 0xfe93, 0xfe94, 0x629, 0x629 }, + { 0x62a, 3, 0xfe95, 0xfe96, 0xfe97, 0xfe98 }, + { 0x62b, 3, 0xfe99, 0xfe9a, 0xfe9b, 0xfe9c }, + { 0x62c, 3, 0xfe9d, 0xfe9e, 0xfe9f, 0xfea0 }, + { 0x62d, 3, 0xfea1, 0xfea2, 0xfea3, 0xfea4 }, + { 0x62e, 3, 0xfea5, 0xfea6, 0xfea7, 0xfea8 }, + { 0x62f, 2, 0xfea9, 0xfeaa, 0x62f, 0x62f }, + { 0x630, 2, 0xfeab, 0xfeac, 0x630, 0x630 }, + { 0x631, 2, 0xfead, 0xfeae, 0x631, 0x631 }, + { 0x632, 2, 0xfeaf, 0xfeb0, 0x632, 0x632 }, + { 0x633, 3, 0xfeb1, 0xfeb2, 0xfeb3, 0xfeb4 }, + { 0x634, 3, 0xfeb5, 0xfeb6, 0xfeb7, 0xfeb8 }, + { 0x635, 3, 0xfeb9, 0xfeba, 0xfebb, 0xfebc }, + { 0x636, 3, 0xfebd, 0xfebe, 0xfebf, 0xfec0 }, + { 0x637, 3, 0xfec1, 0xfec2, 0xfec3, 0xfec4 }, + { 0x638, 3, 0xfec5, 0xfec6, 0xfec7, 0xfec8 }, + { 0x639, 3, 0xfec9, 0xfeca, 0xfecb, 0xfecc }, + { 0x63a, 3, 0xfecd, 0xfece, 0xfecf, 0xfed0 }, + { 0x63b, 8, 0x63b, 0x63b, 0x63b, 0x63b }, + { 0x63c, 8, 0x63c, 0x63c, 0x63c, 0x63c }, + { 0x63d, 8, 0x63d, 0x63d, 0x63d, 0x63d }, + { 0x63e, 8, 0x63e, 0x63e, 0x63e, 0x63e }, + { 0x63f, 8, 0x63f, 0x63f, 0x63f, 0x63f }, + { 0x640, 3, 0x640, 0x640, 0x640, 0x640 }, + { 0x641, 3, 0xfed1, 0xfed2, 0xfed3, 0xfed4 }, + { 0x642, 3, 0xfed5, 0xfed6, 0xfed7, 0xfed8 }, + { 0x643, 3, 0xfed9, 0xfeda, 0xfedb, 0xfedc }, + { 0x644, 3, 0xfedd, 0xfede, 0xfedf, 0xfee0 }, + { 0x645, 3, 0xfee1, 0xfee2, 0xfee3, 0xfee4 }, + { 0x646, 3, 0xfee5, 0xfee6, 0xfee7, 0xfee8 }, + { 0x647, 3, 0xfee9, 0xfeea, 0xfeeb, 0xfeec }, + { 0x648, 2, 0xfeed, 0xfeee, 0x648, 0x648 }, + { 0x649, 3, 0xfeef, 0xfef0, 0xfbe8, 0xfbe9 }, + { 0x64a, 3, 0xfef1, 0xfef2, 0xfef3, 0xfef4 }, + { 0x64b, 4, 0x64b, 0x64b, 0x64b, 0x64b }, + { 0x64c, 4, 0x64c, 0x64c, 0x64c, 0x64c }, + { 0x64d, 4, 0x64d, 0x64d, 0x64d, 0x64d }, + { 0x64e, 4, 0x64e, 0x64e, 0x64e, 0x64e }, + { 0x64f, 4, 0x64f, 0x64f, 0x64f, 0x64f }, + { 0x650, 4, 0x650, 0x650, 0x650, 0x650 }, + { 0x651, 4, 0x651, 0x651, 0x651, 0x651 }, + { 0x652, 4, 0x652, 0x652, 0x652, 0x652 }, + { 0x653, 4, 0x653, 0x653, 0x653, 0x653 }, + { 0x654, 4, 0x654, 0x654, 0x654, 0x654 }, + { 0x655, 4, 0x655, 0x655, 0x655, 0x655 }, + { 0x656, 4, 0x656, 0x656, 0x656, 0x656 }, + { 0x657, 4, 0x657, 0x657, 0x657, 0x657 }, + { 0x658, 4, 0x658, 0x658, 0x658, 0x658 }, + { 0x659, 4, 0x659, 0x659, 0x659, 0x659 }, + { 0x65a, 4, 0x65a, 0x65a, 0x65a, 0x65a }, + { 0x65b, 4, 0x65b, 0x65b, 0x65b, 0x65b }, + { 0x65c, 4, 0x65c, 0x65c, 0x65c, 0x65c }, + { 0x65d, 4, 0x65d, 0x65d, 0x65d, 0x65d }, + { 0x65e, 4, 0x65e, 0x65e, 0x65e, 0x65e }, + { 0x65f, 3, 0x65f, 0x65f, 0x65f, 0x65f }, + { 0x660, 3, 0x660, 0x660, 0x660, 0x660 }, + { 0x661, 3, 0x661, 0x661, 0x661, 0x661 }, + { 0x662, 3, 0x662, 0x662, 0x662, 0x662 }, + { 0x663, 3, 0x663, 0x663, 0x663, 0x663 }, + { 0x664, 3, 0x664, 0x664, 0x664, 0x664 }, + { 0x665, 3, 0x665, 0x665, 0x665, 0x665 }, + { 0x666, 3, 0x666, 0x666, 0x666, 0x666 }, + { 0x667, 3, 0x667, 0x667, 0x667, 0x667 }, + { 0x668, 3, 0x668, 0x668, 0x668, 0x668 }, + { 0x669, 3, 0x669, 0x669, 0x669, 0x669 }, + { 0x66a, 3, 0x66a, 0x66a, 0x66a, 0x66a }, + { 0x66b, 3, 0x66b, 0x66b, 0x66b, 0x66b }, + { 0x66c, 3, 0x66c, 0x66c, 0x66c, 0x66c }, + { 0x66d, 3, 0x66d, 0x66d, 0x66d, 0x66d }, + { 0x66e, 3, 0x66e, 0x66e, 0x66e, 0x66e }, + { 0x66f, 3, 0x66f, 0x66f, 0x66f, 0x66f }, + { 0x670, 8, 0x670, 0x670, 0x670, 0x670 }, + { 0x671, 2, 0xfb50, 0xfb51, 0x671, 0x671 }, + { 0x672, 2, 0x672, 0x672, 0x672, 0x672 }, + { 0x673, 2, 0x673, 0x673, 0x673, 0x673 }, + { 0x674, 8, 0x674, 0x674, 0x674, 0x674 }, + { 0x675, 2, 0x675, 0x675, 0x675, 0x675 }, + { 0x676, 2, 0x676, 0x676, 0x676, 0x676 }, + { 0x677, 2, 0xfbdd, 0x677, 0x677, 0x677 }, + { 0x678, 3, 0x678, 0x678, 0x678, 0x678 }, + { 0x679, 8, 0xfb66, 0xfb67, 0xfb68, 0xfb69 }, + { 0x67a, 8, 0xfb5e, 0xfb5f, 0xfb60, 0xfb61 }, + { 0x67b, 8, 0xfb52, 0xfb53, 0xfb54, 0xfb55 }, + { 0x67c, 8, 0x67c, 0x67c, 0x67c, 0x67c }, + { 0x67d, 8, 0x67d, 0x67d, 0x67d, 0x67d }, + { 0x67e, 8, 0xfb56, 0xfb57, 0xfb58, 0xfb59 }, + { 0x67f, 8, 0xfb62, 0xfb63, 0xfb64, 0xfb65 }, + { 0x680, 8, 0xfb5a, 0xfb5b, 0xfb5c, 0xfb5d }, + { 0x681, 8, 0x681, 0x681, 0x681, 0x681 }, + { 0x682, 8, 0x682, 0x682, 0x682, 0x682 }, + { 0x683, 8, 0xfb76, 0xfb77, 0xfb78, 0xfb79 }, + { 0x684, 8, 0xfb72, 0xfb73, 0xfb74, 0xfb75 }, + { 0x685, 8, 0x685, 0x685, 0x685, 0x685 }, + { 0x686, 8, 0xfb7a, 0xfb7b, 0xfb7c, 0xfb7d }, + { 0x687, 8, 0xfb7e, 0xfb7f, 0xfb80, 0xfb81 }, + { 0x688, 2, 0xfb88, 0xfb89, 0x688, 0x688 }, + { 0x689, 2, 0x689, 0x689, 0x689, 0x689 }, + { 0x68a, 2, 0x68a, 0x68a, 0x68a, 0x68a }, + { 0x68b, 2, 0x68b, 0x68b, 0x68b, 0x68b }, + { 0x68c, 2, 0xfb84, 0xfb85, 0x68c, 0x68c }, + { 0x68d, 2, 0xfb82, 0xfb83, 0x68d, 0x68d }, + { 0x68e, 2, 0xfb86, 0xfb87, 0x68e, 0x68e }, + { 0x68f, 2, 0x68f, 0x68f, 0x68f, 0x68f }, + { 0x690, 2, 0x690, 0x690, 0x690, 0x690 }, + { 0x691, 2, 0xfb8c, 0xfb8d, 0x691, 0x691 }, + { 0x692, 2, 0x692, 0x692, 0x692, 0x692 }, + { 0x693, 2, 0x693, 0x693, 0x693, 0x693 }, + { 0x694, 2, 0x694, 0x694, 0x694, 0x694 }, + { 0x695, 2, 0x695, 0x695, 0x695, 0x695 }, + { 0x696, 2, 0x696, 0x696, 0x696, 0x696 }, + { 0x697, 2, 0x697, 0x697, 0x697, 0x697 }, + { 0x698, 2, 0xfb8a, 0xfb8b, 0x698, 0x698 }, + { 0x699, 2, 0x699, 0x699, 0x699, 0x699 }, + { 0x69a, 3, 0x69a, 0x69a, 0x69a, 0x69a }, + { 0x69b, 3, 0x69b, 0x69b, 0x69b, 0x69b }, + { 0x69c, 3, 0x69c, 0x69c, 0x69c, 0x69c }, + { 0x69d, 3, 0x69d, 0x69d, 0x69d, 0x69d }, + { 0x69e, 3, 0x69e, 0x69e, 0x69e, 0x69e }, + { 0x69f, 3, 0x69f, 0x69f, 0x69f, 0x69f }, + { 0x6a0, 3, 0x6a0, 0x6a0, 0x6a0, 0x6a0 }, + { 0x6a1, 3, 0x6a1, 0x6a1, 0x6a1, 0x6a1 }, + { 0x6a2, 3, 0x6a2, 0x6a2, 0x6a2, 0x6a2 }, + { 0x6a3, 3, 0x6a3, 0x6a3, 0x6a3, 0x6a3 }, + { 0x6a4, 3, 0xfb6a, 0xfb6b, 0xfb6c, 0xfb6d }, + { 0x6a5, 3, 0x6a5, 0x6a5, 0x6a5, 0x6a5 }, + { 0x6a6, 3, 0xfb6e, 0xfb6f, 0xfb70, 0xfb71 }, + { 0x6a7, 3, 0x6a7, 0x6a7, 0x6a7, 0x6a7 }, + { 0x6a8, 3, 0x6a8, 0x6a8, 0x6a8, 0x6a8 }, + { 0x6a9, 3, 0xfb8e, 0xfb8f, 0xfb90, 0xfb91 }, + { 0x6aa, 3, 0x6aa, 0x6aa, 0x6aa, 0x6aa }, + { 0x6ab, 3, 0x6ab, 0x6ab, 0x6ab, 0x6ab }, + { 0x6ac, 3, 0x6ac, 0x6ac, 0x6ac, 0x6ac }, + { 0x6ad, 3, 0xfbd3, 0xfbd4, 0xfbd5, 0xfbd6 }, + { 0x6ae, 3, 0x6ae, 0x6ae, 0x6ae, 0x6ae }, + { 0x6af, 3, 0xfb92, 0xfb93, 0xfb94, 0xfb95 }, + { 0x6b0, 3, 0x6b0, 0x6b0, 0x6b0, 0x6b0 }, + { 0x6b1, 3, 0xfb9a, 0xfb9b, 0xfb9c, 0xfb9d }, + { 0x6b2, 3, 0x6b2, 0x6b2, 0x6b2, 0x6b2 }, + { 0x6b3, 3, 0xfb96, 0xfb97, 0xfb98, 0xfb99 }, + { 0x6b4, 3, 0x6b4, 0x6b4, 0x6b4, 0x6b4 }, + { 0x6b5, 3, 0x6b5, 0x6b5, 0x6b5, 0x6b5 }, + { 0x6b6, 3, 0x6b6, 0x6b6, 0x6b6, 0x6b6 }, + { 0x6b7, 3, 0x6b7, 0x6b7, 0x6b7, 0x6b7 }, + { 0x6b8, 3, 0x6b8, 0x6b8, 0x6b8, 0x6b8 }, + { 0x6b9, 3, 0x6b9, 0x6b9, 0x6b9, 0x6b9 }, + { 0x6ba, 3, 0xfb9e, 0xfb9f, 0x6ba, 0x6ba }, + { 0x6bb, 3, 0xfba0, 0xfba1, 0xfba2, 0xfba3 }, + { 0x6bc, 3, 0x6bc, 0x6bc, 0x6bc, 0x6bc }, + { 0x6bd, 3, 0x6bd, 0x6bd, 0x6bd, 0x6bd }, + { 0x6be, 3, 0xfbaa, 0xfbab, 0xfbac, 0xfbad }, + { 0x6bf, 3, 0x6bf, 0x6bf, 0x6bf, 0x6bf }, + { 0x6c0, 2, 0xfba4, 0xfba5, 0x6c0, 0x6c0 }, + { 0x6c1, 3, 0xfba6, 0xfba7, 0xfba8, 0xfba9 }, + { 0x6c2, 2, 0x6c2, 0x6c2, 0x6c2, 0x6c2 }, + { 0x6c3, 2, 0x6c3, 0x6c3, 0x6c3, 0x6c3 }, + { 0x6c4, 2, 0x6c4, 0x6c4, 0x6c4, 0x6c4 }, + { 0x6c5, 2, 0xfbe0, 0xfbe1, 0x6c5, 0x6c5 }, + { 0x6c6, 2, 0xfbd9, 0xfbda, 0x6c6, 0x6c6 }, + { 0x6c7, 2, 0xfbd7, 0xfbd8, 0x6c7, 0x6c7 }, + { 0x6c8, 2, 0xfbdb, 0xfbdc, 0x6c8, 0x6c8 }, + { 0x6c9, 2, 0xfbe2, 0xfbe3, 0x6c9, 0x6c9 }, + { 0x6ca, 2, 0x6ca, 0x6ca, 0x6ca, 0x6ca }, + { 0x6cb, 2, 0xfbde, 0xfbdf, 0x6cb, 0x6cb }, + { 0x6cc, 3, 0xfbfc, 0xfbfd, 0xfbfe, 0xfbff }, + { 0x6cd, 2, 0x6cd, 0x6cd, 0x6cd, 0x6cd }, + { 0x6ce, 3, 0x6ce, 0x6ce, 0x6ce, 0x6ce }, + { 0x6cf, 2, 0x6cf, 0x6cf, 0x6cf, 0x6cf }, + { 0x6d0, 3, 0xfbe4, 0xfbe5, 0xfbe6, 0xfbe7 }, + { 0x6d1, 3, 0x6d1, 0x6d1, 0x6d1, 0x6d1 }, + { 0x6d2, 2, 0xfbae, 0xfbaf, 0x6d2, 0x6d2 }, + { 0x6d3, 2, 0xfbb0, 0xfbb1, 0x6d3, 0x6d3 }, + { 0x6d4, 2, 0x6d4, 0x6d4, 0x6d4, 0x6d4 }, + { 0x6d5, 2, 0x6d5, 0x6d5, 0x6d5, 0x6d5 }, + { 0x6d6, 8, 0x6d6, 0x6d6, 0x6d6, 0x6d6 }, + { 0x6d7, 8, 0x6d7, 0x6d7, 0x6d7, 0x6d7 }, + { 0x6d8, 8, 0x6d8, 0x6d8, 0x6d8, 0x6d8 }, + { 0x6d9, 8, 0x6d9, 0x6d9, 0x6d9, 0x6d9 }, + { 0x6da, 8, 0x6da, 0x6da, 0x6da, 0x6da }, + { 0x6db, 8, 0x6db, 0x6db, 0x6db, 0x6db }, + { 0x6dc, 8, 0x6dc, 0x6dc, 0x6dc, 0x6dc }, + { 0x6dd, 8, 0x6dd, 0x6dd, 0x6dd, 0x6dd }, + { 0x6de, 8, 0x6de, 0x6de, 0x6de, 0x6de }, + { 0x6df, 8, 0x6df, 0x6df, 0x6df, 0x6df }, + { 0x6e0, 8, 0x6e0, 0x6e0, 0x6e0, 0x6e0 }, + { 0x6e1, 8, 0x6e1, 0x6e1, 0x6e1, 0x6e1 }, + { 0x6e2, 8, 0x6e2, 0x6e2, 0x6e2, 0x6e2 }, + { 0x6e3, 8, 0x6e3, 0x6e3, 0x6e3, 0x6e3 }, + { 0x6e4, 8, 0x6e4, 0x6e4, 0x6e4, 0x6e4 }, + { 0x6e5, 8, 0x6e5, 0x6e5, 0x6e5, 0x6e5 }, + { 0x6e6, 8, 0x6e6, 0x6e6, 0x6e6, 0x6e6 }, + { 0x6e7, 8, 0x6e7, 0x6e7, 0x6e7, 0x6e7 }, + { 0x6e8, 8, 0x6e8, 0x6e8, 0x6e8, 0x6e8 }, + { 0x6e9, 8, 0x6e9, 0x6e9, 0x6e9, 0x6e9 }, + { 0x6ea, 8, 0x6ea, 0x6ea, 0x6ea, 0x6ea }, + { 0x6eb, 8, 0x6eb, 0x6eb, 0x6eb, 0x6eb }, + { 0x6ec, 8, 0x6ec, 0x6ec, 0x6ec, 0x6ec }, + { 0x6ed, 8, 0x6ed, 0x6ed, 0x6ed, 0x6ed }, + { 0x6ee, 2, 0x6ee, 0x6ee, 0x6ee, 0x6ee }, + { 0x6ef, 2, 0x6ef, 0x6ef, 0x6ef, 0x6ef }, + { 0x6f0, 8, 0x6f0, 0x6f0, 0x6f0, 0x6f0 }, + { 0x6f1, 8, 0x6f1, 0x6f1, 0x6f1, 0x6f1 }, + { 0x6f2, 8, 0x6f2, 0x6f2, 0x6f2, 0x6f2 }, + { 0x6f3, 8, 0x6f3, 0x6f3, 0x6f3, 0x6f3 }, + { 0x6f4, 8, 0x6f4, 0x6f4, 0x6f4, 0x6f4 }, + { 0x6f5, 8, 0x6f5, 0x6f5, 0x6f5, 0x6f5 }, + { 0x6f6, 8, 0x6f6, 0x6f6, 0x6f6, 0x6f6 }, + { 0x6f7, 8, 0x6f7, 0x6f7, 0x6f7, 0x6f7 }, + { 0x6f8, 8, 0x6f8, 0x6f8, 0x6f8, 0x6f8 }, + { 0x6f9, 8, 0x6f9, 0x6f9, 0x6f9, 0x6f9 }, + { 0x6fa, 3, 0x6fa, 0x6fa, 0x6fa, 0x6fa }, + { 0x6fb, 3, 0x6fb, 0x6fb, 0x6fb, 0x6fb } +}; +WCHAR ArabicShapingStart=0x0622, ArabicShapingEnd=0x06FC;