wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Maarten Lankhorst : gdi: Implement implicit resolving in BiDi.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 588c5a90fdf79e58fb94bcd69ed615e9f2d54b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=588c5a90fdf79e58fb94bcd69… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 15:17:58 2007 +0200 gdi: Implement implicit resolving in BiDi. --- dlls/gdi32/bidi.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 59f3fff..7a93ec6 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -770,6 +770,50 @@ static void resolveNeutrals(int baselevel, WORD *pcls, const WORD *plevel, int c SetDeferredRun(pcls, cchRun, ich, clsRun); } +/* RESOLVE IMPLICIT */ + +/*------------------------------------------------------------------------ + Function: resolveImplicit + + Recursively resolves implicit embedding levels. + Implements rules I1 and I2 of the Unicode Bidirectional Algorithm. + + Input: Array of direction classes + Character count + Base level + + In/Out: Array of embedding levels + + Note: levels may exceed 15 on output. + Accepted subset of direction classes + R, L, AN, EN +------------------------------------------------------------------------*/ +static const WORD addLevel[][4] = +{ + /* L, R, AN, EN */ +/* even */ { 0, 1, 2, 2, }, +/* odd */ { 1, 0, 1, 1, } + +}; + +static void resolveImplicit(const WORD * pcls, WORD *plevel, int cch) +{ + int ich = 0; + for (; ich < cch; ich++) + { + /* cannot resolve bn here, since some bn were resolved to strong + * types in resolveWeak. To remove these we need the original + * types, which are available again in resolveWhiteSpace */ + if (pcls[ich] == BN) + { + continue; + } + ASSERT(pcls[ich] > 0); /* "No Neutrals allowed to survive here." */ + ASSERT(pcls[ich] < 5); /* "Out of range." */ + plevel[ich] += addLevel[odd(plevel[ich])][pcls[ich] - 1]; + } +} + /************************************************************* * BIDI_Reorder */ @@ -868,6 +912,9 @@ BOOL BIDI_Reorder( /* resolve neutrals */ resolveNeutrals(baselevel, chartype, levels, i); + /* resolveImplicit */ + resolveImplicit(chartype, levels, i); + /* Temporary stub: Just reverse the odd levels */ for (j = lastgood = 0; j < i; ++j) if (levels[j] != levels[lastgood])

1 0

Maarten Lankhorst : gdi: Implement neutrals resolving in BiDi.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 032543e54dec387ae0089fe9e5dd0cc0fbc2d253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032543e54dec387ae0089fe9e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 15:16:38 2007 +0200 gdi: Implement neutrals resolving in BiDi. --- dlls/gdi32/bidi.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 0c9103a..59f3fff 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -613,6 +613,163 @@ static void resolveWeak(int baselevel, WORD *pcls, WORD *plevel, int cch) SetDeferredRun(pcls, cchRun, ich, clsRun); } +/* RESOLVE NEUTRAL TYPES */ + +/* action values */ +enum neutralactions +{ + /* action to resolve previous input */ + nL = L, /* resolve EN to L */ + En = 3 << 4, /* resolve neutrals run to embedding level direction */ + Rn = R << 4, /* resolve neutrals run to strong right */ + Ln = L << 4, /* resolved neutrals run to strong left */ + In = (1<<8), /* increment count of deferred neutrals */ + LnL = (1<<4)+L, /* set run and EN to L */ +}; + +static int GetDeferredNeutrals(int action, int level) +{ + action = (action >> 4) & 0xF; + if (action == (En >> 4)) + return EmbeddingDirection(level); + else + return action; +} + +static int GetResolvedNeutrals(int action) +{ + action = action & 0xF; + if (action == In) + return 0; + else + return action; +} + +/* state values */ +enum resolvestates +{ + /* new temporary class */ + r, /* R and characters resolved to R */ + l, /* L and characters resolved to L */ + rn, /* N preceded by right */ + ln, /* N preceded by left */ + a, /* AN preceded by left (the abbrev 'la' is used up above) */ + na, /* N preceeded by a */ +} ; + + +/*------------------------------------------------------------------------ + Notes: + + By rule W7, whenever a EN is 'dominated' by an L (including start of + run with embedding direction = L) it is resolved to, and further treated + as L. + + This leads to the need for 'a' and 'na' states. +------------------------------------------------------------------------*/ + +static const int actionNeutrals[][5] = +{ +/* N, L, R, AN, EN = cls */ + { In, 0, 0, 0, 0 }, /* r right */ + { In, 0, 0, 0, L }, /* l left */ + + { In, En, Rn, Rn, Rn }, /* rn N preceded by right */ + { In, Ln, En, En, LnL}, /* ln N preceded by left */ + + { In, 0, 0, 0, L }, /* a AN preceded by left */ + { In, En, Rn, Rn, En }, /* na N preceded by a */ +} ; + +static const int stateNeutrals[][5] = +{ +/* N, L, R, AN, EN */ + { rn, l, r, r, r }, /* r right */ + { ln, l, r, a, l }, /* l left */ + + { rn, l, r, r, r }, /* rn N preceded by right */ + { ln, l, r, a, l }, /* ln N preceded by left */ + + { na, l, r, a, l }, /* a AN preceded by left */ + { na, l, r, a, l }, /* na N preceded by la */ +} ; + +/*------------------------------------------------------------------------ + Function: resolveNeutrals + + Resolves the directionality of neutral character types. + + Implements rules W7, N1 and N2 of the Unicode Bidi Algorithm. + + Input: Array of embedding levels + Character count + Baselevel + + In/Out: Array of directional classes + + Note: On input only these directional classes are expected + R, L, N, AN, EN and BN + + W8 resolves a number of ENs to L +------------------------------------------------------------------------*/ +static void resolveNeutrals(int baselevel, WORD *pcls, const WORD *plevel, int cch) +{ + /* the state at the start of text depends on the base level */ + int state = odd(baselevel) ? r : l; + int cls; + + int cchRun = 0; + int level = baselevel; + + int action, clsRun, clsNew; + int ich = 0; + for (; ich < cch; ich++) + { + /* ignore boundary neutrals */ + if (pcls[ich] == BN) + { + /* include in the count for a deferred run */ + if (cchRun) + cchRun++; + + /* skip any further processing */ + continue; + } + + ASSERT(pcls[ich] < 5); /* "Only N, L, R, AN, EN are allowed" */ + cls = pcls[ich]; + + action = actionNeutrals[state][cls]; + + /* resolve the directionality for deferred runs */ + clsRun = GetDeferredNeutrals(action, level); + if (clsRun != N) + { + SetDeferredRun(pcls, cchRun, ich, clsRun); + cchRun = 0; + } + + /* resolve the directionality class at the current location */ + clsNew = GetResolvedNeutrals(action); + if (clsNew != N) + pcls[ich] = clsNew; + + if (In & action) + cchRun++; + + state = stateNeutrals[state][cls]; + level = plevel[ich]; + } + + /* resolve any deferred runs */ + cls = EmbeddingDirection(level); /* eor has type of current level */ + + /* resolve the directionality for deferred runs */ + clsRun = GetDeferredNeutrals(actionNeutrals[state][cls], level); + if (clsRun != N) + SetDeferredRun(pcls, cchRun, ich, clsRun); +} + /************************************************************* * BIDI_Reorder */ @@ -708,6 +865,9 @@ BOOL BIDI_Reorder( /* resolve weak */ resolveWeak(baselevel, chartype, levels, i); + /* resolve neutrals */ + resolveNeutrals(baselevel, chartype, levels, i); + /* Temporary stub: Just reverse the odd levels */ for (j = lastgood = 0; j < i; ++j) if (levels[j] != levels[lastgood])

1 0

Maarten Lankhorst : gdi: Implement weak resolving in BiDi.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 6554e5b1a1340cfa1afbcee535cd275c220ab4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6554e5b1a1340cfa1afbcee53… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 15:15:30 2007 +0200 gdi: Implement weak resolving in BiDi. --- dlls/gdi32/bidi.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 270 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6554e5b1a1340cfa1afbc…

1 0

Maarten Lankhorst : gdi: Implement explicit resolving in BiDi.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: dbdf6fde20a9dbef54b87a3993eb4d0245b13771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdf6fde20a9dbef54b87a399… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 15:03:22 2007 +0200 gdi: Implement explicit resolving in BiDi. --- dlls/gdi32/bidi.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index c10dd43..f78b404 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); #define ASSERT(x) do { if (!(x)) FIXME("assert failed: %s\n", #x); } while(0) +#define MAX_LEVEL 61 /* HELPER FUNCTIONS AND DECLARATIONS */ @@ -237,6 +238,114 @@ static int resolveParagraphs(WORD *types, int cch) return ich; } +/* RESOLVE EXPLICIT */ + +static WORD GreaterEven(int i) +{ + return odd(i) ? i + 1 : i + 2; +} + +static WORD GreaterOdd(int i) +{ + return odd(i) ? i + 2 : i + 1; +} + +/*------------------------------------------------------------------------ + Function: resolveExplicit + + Recursively resolves explicit embedding levels and overrides. + Implements rules X1-X9, of the Unicode Bidirectional Algorithm. + + Input: Base embedding level and direction + Character count + + Output: Array of embedding levels + + In/Out: Array of direction classes + + + Note: The function uses two simple counters to keep track of + matching explicit codes and PDF. Use the default argument for + the outermost call. The nesting counter counts the recursion + depth and not the embedding level. +------------------------------------------------------------------------*/ + +static int resolveExplicit(int level, int dir, WORD *pcls, WORD *plevel, int cch, int nNest) +{ + /* always called with a valid nesting level + nesting levels are != embedding levels */ + int nLastValid = nNest; + int ich = 0; + + /* check input values */ + ASSERT(nNest >= 0 && level >= 0 && level <= MAX_LEVEL); + + /* process the text */ + for (; ich < cch; ich++) + { + WORD cls = pcls[ich]; + switch (cls) + { + case LRO: + case LRE: + nNest++; + if (GreaterEven(level) <= MAX_LEVEL - (cls == LRO ? 2 : 0)) + { + plevel[ich] = GreaterEven(level); + pcls[ich] = BN; + ich += resolveExplicit(plevel[ich], (cls == LRE ? N : L), + &pcls[ich+1], &plevel[ich+1], + cch - (ich+1), nNest); + nNest--; + continue; + } + cls = pcls[ich] = BN; + break; + + case RLO: + case RLE: + nNest++; + if (GreaterOdd(level) <= MAX_LEVEL - (cls == RLO ? 2 : 0)) + { + plevel[ich] = GreaterOdd(level); + pcls[ich] = BN; + ich += resolveExplicit(plevel[ich], (cls == RLE ? N : R), + &pcls[ich+1], &plevel[ich+1], + cch - (ich+1), nNest); + nNest--; + continue; + } + cls = pcls[ich] = BN; + break; + + case PDF: + cls = pcls[ich] = BN; + if (nNest) + { + if (nLastValid < nNest) + { + nNest--; + } + else + { + cch = ich; /* break the loop, but complete body */ + } + } + } + + /* Apply the override */ + if (dir != N) + { + cls = dir; + } + plevel[ich] = level; + if (pcls[ich] != BN) + pcls[ich] = cls; + } + + return ich; +} + /************************************************************* * BIDI_Reorder */ @@ -326,10 +435,17 @@ BOOL BIDI_Reorder( } } - /* Temporary stub: Assume everything is in the direction we want */ - memset(levels, baselevel, i * sizeof(WORD)); - if (baselevel) - reverse(lpOutString, i); + /* resolve explicit */ + resolveExplicit(baselevel, forcedir, chartype, levels, i, 0); + + /* Temporary stub: Just reverse the odd levels */ + for (j = lastgood = 0; j < i; ++j) + if (levels[j] != levels[lastgood]) + { + if (odd(levels[lastgood])) + reverse(lpOutString + done + lastgood, j - 1); + lastgood = j; + } if (lpOrder) {

1 0

Maarten Lankhorst : gdi: Implement BiDi classification of characters and copying according to them.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 426debe1876753b06be45d08633245689f8ecb20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426debe1876753b06be45d086… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 10:16:22 2007 +0200 gdi: Implement BiDi classification of characters and copying according to them. --- dlls/gdi32/bidi.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 304 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=426debe1876753b06be45…

1 0

Maarten Lankhorst : gdi: Remove support for libicu and all dependencies.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: c3cf79d8177de271dfc3636684d23d2832fdbbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cf79d8177de271dfc363668… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 11 13:07:56 2007 +0200 gdi: Remove support for libicu and all dependencies. --- configure | 86 +--------------------------------------------- configure.ac | 21 ----------- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/bidi.c | 73 +++++--------------------------------- dlls/gdi32/font.c | 4 +- dlls/gdi32/gdi_private.h | 1 - include/config.h.in | 6 --- 7 files changed, 14 insertions(+), 179 deletions(-) diff --git a/configure b/configure index 9b5d197..ab97690 100755 --- a/configure +++ b/configure @@ -743,7 +743,6 @@ gphoto2_devel gphoto2port_devel GPHOTO2LIBS GPHOTO2INCL -ICULIBS RESOLVLIBS LCMSLIBS LDAPLIBS @@ -6750,7 +6749,6 @@ done - for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -6859,7 +6857,6 @@ for ac_header in \ sys/wait.h \ syscall.h \ termios.h \ - unicode/ubidi.h \ unistd.h \ utime.h \ valgrind/memcheck.h @@ -12511,86 +12508,6 @@ fi -if test "$ac_cv_header_unicode_ubidi_h" = "yes" -then - saved_libs="$LIBS" - icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s" - if test -n "$ICU_LIB_DIR" - then - icu_libs="-L$ICU_LIB_DIR $icu_libs" - fi - { echo "$as_me:$LINENO: checking whether can link with ICU libraries" >&5 -echo $ECHO_N "checking whether can link with ICU libraries... $ECHO_C" >&6; } - LIBS="$saved_libs $icu_libs" - if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <unicode/ubidi.h> -int -main () -{ -ubidi_open() - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICU 1 -_ACEOF - - ICULIBS="$icu_libs" - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - LIBS="$saved_libs" -fi -if test "x$ICULIBS" = "x"; then - wine_notices="$wine_notices|libicu development files not found. -Wine will be built without bidi (Right to Left) support. (gdi32.dll)" -fi - - RESOLVLIBS="" if test "$ac_cv_header_resolv_h" = "yes" @@ -22141,7 +22058,6 @@ gphoto2_devel!$gphoto2_devel$ac_delim gphoto2port_devel!$gphoto2port_devel$ac_delim GPHOTO2LIBS!$GPHOTO2LIBS$ac_delim GPHOTO2INCL!$GPHOTO2INCL$ac_delim -ICULIBS!$ICULIBS$ac_delim RESOLVLIBS!$RESOLVLIBS$ac_delim LCMSLIBS!$LCMSLIBS$ac_delim LDAPLIBS!$LDAPLIBS$ac_delim @@ -22168,7 +22084,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index fe36eb2..2c8c5da 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,6 @@ AC_CHECK_HEADERS(\ sys/wait.h \ syscall.h \ termios.h \ - unicode/ubidi.h \ unistd.h \ utime.h \ valgrind/memcheck.h @@ -819,26 +818,6 @@ WINE_NOTICE_IF([test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],[libgphoto2 de Wine will be built without Digital Camera support. (gphoto2.ds/twain_32.dll)]) -dnl **** Check for the ICU library **** -if test "$ac_cv_header_unicode_ubidi_h" = "yes" -then - saved_libs="$LIBS" - icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s" - if test -n "$ICU_LIB_DIR" - then - icu_libs="-L$ICU_LIB_DIR $icu_libs" - fi - AC_MSG_CHECKING(whether can link with ICU libraries) - LIBS="$saved_libs $icu_libs" - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <unicode/ubidi.h>]],[[ubidi_open()]])], - [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) - AC_SUBST(ICULIBS,"$icu_libs") - AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) - LIBS="$saved_libs" -fi -WINE_NOTICE_IF([test "x$ICULIBS" = "x"],[libicu development files not found. -Wine will be built without bidi (Right to Left) support. (gdi32.dll)]) - dnl **** Check for resolver library *** AC_SUBST(RESOLVLIBS,"") if test "$ac_cv_header_resolv_h" = "yes" diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index e3b2d67..ee44d14 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -7,7 +7,7 @@ MODULE = gdi32.dll IMPORTLIB = libgdi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 ntdll EXTRAINCL = @FREETYPEINCL@ -EXTRALIBS = @ICULIBS@ @CARBONLIB@ +EXTRALIBS = @CARBONLIB@ SPEC_SRCS16 = \ dispdib.spec \ diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index ec8b36c..d21b23b 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -22,10 +22,6 @@ #include "config.h" #include <stdarg.h> -#ifdef HAVE_UNICODE_UBIDI_H -#include <unicode/ubidi.h> -#endif - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -34,13 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); -#ifdef HAVE_ICU -BOOL BidiAvail = TRUE; -#else -BOOL BidiAvail = FALSE; -#endif - - /************************************************************* * BIDI_Reorder */ @@ -54,62 +43,20 @@ BOOL BIDI_Reorder( UINT *lpOrder /* [out] Logical -> Visual order map */ ) { + unsigned i; TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n", debugstr_wn(lpString, uCount), uCount, dwFlags, lpOutString, lpOrder); -#ifdef HAVE_ICU - if ((dwFlags & GCP_REORDER) != 0) { - UBiDi *bidi; - UErrorCode err=0; - UBiDiLevel level=0; - - bidi=ubidi_open(); - if( bidi==NULL ) { - WARN("Failed to allocate structure\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - switch( dwWineGCP_Flags&WINE_GCPW_DIR_MASK ) - { - case WINE_GCPW_FORCE_LTR: - level=0; - break; - case WINE_GCPW_FORCE_RTL: - level=1; - break; - case WINE_GCPW_LOOSE_LTR: - level=UBIDI_DEFAULT_LTR; - break; - case WINE_GCPW_LOOSE_RTL: - level=UBIDI_DEFAULT_RTL; - break; - } - - ubidi_setPara( bidi, lpString, uCount, level, NULL, &err ); - if( lpOutString!=NULL ) { - ubidi_writeReordered( bidi, lpOutString, uCount, - (dwFlags&GCP_SYMSWAPOFF)?0:UBIDI_DO_MIRRORING, &err ); - } - - if( lpOrder!=NULL ) { - ubidi_getLogicalMap( bidi, lpOrder, &err ); - } - - ubidi_close( bidi ); - - if( U_FAILURE(err) ) { - FIXME("ICU Library return error code %d.\n", err ); - FIXME("Please report this error to wine-devel(a)winehq.org so we can place " - "descriptive Windows error codes here\n"); - SetLastError(ERROR_INVALID_LEVEL); /* This error is cryptic enough not to mean anything, I hope */ - - return FALSE; - } + if (!(dwFlags & GCP_REORDER)) + { + FIXME("Asked to reorder without reorder flag set\n"); + return FALSE; } + memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + if (lpOrder) + for (i = 0; i < uCount; ++i) + *(lpOrder++) = i; + return TRUE; -#else /* HAVE_ICU */ - return FALSE; -#endif /* HAVE_ICU */ } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b5ec980..44a3dde 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1907,7 +1907,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (!lprect) flags &= ~ETO_CLIPPED; - if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && BidiAvail && count > 0 ) + if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); @@ -2997,7 +2997,7 @@ GetCharacterPlacementW( /* return number of initialized fields */ lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 || !BidiAvail) + if((dwFlags&GCP_REORDER)==0 ) { /* Treat the case where no special handling was requested in a fastpath way */ /* copy will do if the GCP_REORDER flag is not set */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c665373..157a7de 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -383,7 +383,6 @@ typedef struct tagBITMAPOBJ #define WINE_GCPW_DIR_MASK 3 extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder ); -extern BOOL BidiAvail; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ); diff --git a/include/config.h.in b/include/config.h.in index df65adb..8692bb1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -228,9 +228,6 @@ /* Define to 1 if you have the <hal/libhal.h> header file. */ #undef HAVE_HAL_LIBHAL_H -/* Define to 1 if the ICU libraries are installed */ -#undef HAVE_ICU - /* Define to 1 if you have the <ieeefp.h> header file. */ #undef HAVE_IEEEFP_H @@ -861,9 +858,6 @@ /* Define to 1 if you have the <ucontext.h> header file. */ #undef HAVE_UCONTEXT_H -/* Define to 1 if you have the <unicode/ubidi.h> header file. */ -#undef HAVE_UNICODE_UBIDI_H - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H

1 0

Jacek Caban : mshtml: Added Exec(IDM_FONT) stub implementation.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 21214ed3d4ed55e719c7f1c6c6e7410d9be3f880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21214ed3d4ed55e719c7f1c6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:35:30 2007 +0200 mshtml: Added Exec(IDM_FONT) stub implementation. --- dlls/mshtml/editor.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index fa2e75e..4dc4c08 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -780,6 +780,13 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return S_OK; } +static HRESULT exec_font(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + + FIXME("(%p)->(%p %p)\n", This, in, out); + return E_NOTIMPL; +} + static HRESULT exec_selectall(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)\n", This); @@ -1359,6 +1366,7 @@ const cmdtable_t editmode_cmds[] = { {IDM_JUSTIFYCENTER, query_justify, exec_justifycenter}, {IDM_JUSTIFYRIGHT, query_justify, exec_justifyright}, {IDM_JUSTIFYLEFT, query_justify, exec_justifyleft}, + {IDM_FONT, NULL, exec_font}, {IDM_UNDERLINE, query_edit_status, exec_underline}, {IDM_HORIZONTALLINE, query_edit_status, exec_horizontalline}, {IDM_ORDERLIST, query_edit_status, exec_orderlist},

1 0

Jacek Caban : mshtml: Added more tests.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 48d6c1f5acfe2986a5de211c053e315c9b713fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d6c1f5acfe2986a5de211c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:33:28 2007 +0200 mshtml: Added more tests. --- dlls/mshtml/tests/dom.c | 107 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3deac31..80675f5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -29,10 +29,13 @@ #include "mshtml.h" #include "docobj.h" +static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; static const char doc_str2[] = "<html><body>test a<font size=\"2\">bc 123<br />it's </font>text<br /></body></html>"; +static const WCHAR noneW[] = {'N','o','n','e',0}; + static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR wordW[] = {'w','o','r','d',0}; @@ -96,10 +99,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); test_node_name((IUnknown*)elem, "HTML"); - IHTMLElement_Release(elem); - hres = IHTMLDocument2_get_body(doc, &elem); - test_node_name((IUnknown*)elem, "BODY"); IHTMLElement_Release(elem); } @@ -347,6 +347,106 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(body_range); } +static void test_default_style(IHTMLStyle *style) +{ + VARIANT_BOOL b; + VARIANT v; + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_fontFamily(style, &str); + ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres); + ok(!str, "fontFamily = %s\n", dbgstr_w(str)); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_fontWeight(style, &str); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(!str, "fontWeight = %s\n", dbgstr_w(str)); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_fontSize(style, &v); + ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_color(style, &v); + ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(color) = %s\n", dbgstr_w(V_BSTR(&v))); + + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationUnderline(style, &b); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); +} + +static void test_default_selection(IHTMLDocument2 *doc) +{ + IHTMLSelectionObject *selection; + IHTMLTxtRange *range; + IDispatch *disp; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_selection(doc, &selection); + ok(hres == S_OK, "get_selection failed: %08x\n", hres); + + hres = IHTMLSelectionObject_get_type(selection, &str); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(!lstrcmpW(str, noneW), "type = %s\n", dbgstr_w(str)); + SysFreeString(str); + + hres = IHTMLSelectionObject_createRange(selection, &disp); + IHTMLSelectionObject_Release(selection); + ok(hres == S_OK, "createRange failed: %08x\n", hres); + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTxtRange, (void**)&range); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IHTMLTxtRange interface: %08x\n", hres); + + test_range_text(range, NULL); + IHTMLTxtRange_Release(range); +} + +static void test_defaults(IHTMLDocument2 *doc) +{ + IHTMLStyleSheetsCollection *stylesheetcol; + IHTMLElement *elem; + IHTMLStyle *style; + long l; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_get_style(elem, &style); + IHTMLElement_Release(elem); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + test_default_style(style); + + IHTMLStyle_Release(style); + + hres = IHTMLDocument2_get_styleSheets(doc, &stylesheetcol); + ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres); + + l = 0xdeadbeef; + hres = IHTMLStyleSheetsCollection_get_length(stylesheetcol, &l); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(l == 0, "length = %ld\n", l); + + IHTMLStyleSheetsCollection_Release(stylesheetcol); + + test_default_selection(doc); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -513,6 +613,7 @@ START_TEST(dom) run_domtest(doc_str1, test_doc_elem); run_domtest(doc_str2, test_txtrange); + run_domtest(doc_blank, test_defaults); CoUninitialize(); gecko_installer_workaround(FALSE);

1 0

Jacek Caban : mshtml: Fixed IHTMLTxtRange:: get_text implementation with no nsrange associated.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: acae71ddf59a42dd5169fb199f797537d0f2966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acae71ddf59a42dd5169fb199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:33:03 2007 +0200 mshtml: Fixed IHTMLTxtRange::get_text implementation with no nsrange associated. --- dlls/mshtml/txtrange.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index b7c04f9..4e67af9 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -903,12 +903,14 @@ static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); + *p = NULL; + if(!This->nsrange) + return S_OK; + wstrbuf_init(&buf); range_to_string(This, &buf); if(buf.buf) *p = SysAllocString(buf.buf); - else - *p = NULL; wstrbuf_finish(&buf); TRACE("ret %s\n", debugstr_w(*p));

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheetsCollection:: get_length implementation.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 271049ca0920a852350fe70bdf13d8e23b103244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271049ca0920a852350fe70bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:10:02 2007 +0200 mshtml: Added IHTMLStyleSheetsCollection::get_length implementation. --- dlls/mshtml/htmlstylesheet.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 00a71f6..30be079 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -144,8 +144,15 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_get_length(IHTMLStyleSheetsColle long *p) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 len = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nslist) + nsIDOMStyleSheetList_GetLength(This->nslist, &len); + + *p = len; + return S_OK; } static HRESULT WINAPI HTMLStyleSheetsCollection_get__newEnum(IHTMLStyleSheetsCollection *iface,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007