October 2011 - Wine-commits

Alexandre Julliard : makefiles: Build the pot files with a separate pass from the top-level makefile.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 9c98f6911b6ea991aee4cad18c16485fff0fedd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c98f6911b6ea991aee4cad18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 14:54:03 2011 +0200 makefiles: Build the pot files with a separate pass from the top-level makefile. --- Make.rules.in | 2 -- aclocal.m4 | 57 +++++++++++++++++++++++++++------------------------------ configure | 57 +++++++++++++++++++++++++++------------------------------ 3 files changed, 54 insertions(+), 62 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c3409ac..a095666 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -180,8 +180,6 @@ install install-lib install-dev uninstall:: # Rules for resources -all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) - rsrc.pot: $(WRC) $(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) diff --git a/aclocal.m4 b/aclocal.m4 index 41274ad..7a75fa9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -199,6 +199,31 @@ $ac_dir/__depend__: $ac_makedep dummy @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } +wine_fn_pot_rules () +{ + ac_dir=$[1] + ac_flags=$[2] + + test "x$enable_maintainer_mode" = xyes || return + + if wine_fn_has_flag mc $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/msg.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) msg.pot +$ac_dir/msg.pot: tools/wmc include" + fi + if wine_fn_has_flag po $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) rsrc.pot +$ac_dir/srsrc.pot: tools/wrc include" + fi +} + wine_fn_config_makefile () { ac_dir=$[1] @@ -322,21 +347,7 @@ $ac_dir/__uninstall__:: fi fi - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi]) + wine_fn_pot_rules $ac_dir $ac_flags]) if wine_fn_has_flag staticimplib $ac_flags then @@ -432,21 +443,7 @@ wine_fn_config_program () AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__" - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ diff --git a/configure b/configure index 8cfccff3..2163c84 100755 --- a/configure +++ b/configure @@ -14224,6 +14224,31 @@ $ac_dir/__depend__: $ac_makedep dummy @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } +wine_fn_pot_rules () +{ + ac_dir=$1 + ac_flags=$2 + + test "x$enable_maintainer_mode" = xyes || return + + if wine_fn_has_flag mc $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/msg.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) msg.pot +$ac_dir/msg.pot: tools/wmc include" + fi + if wine_fn_has_flag po $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) rsrc.pot +$ac_dir/srsrc.pot: tools/wrc include" + fi +} + wine_fn_config_makefile () { ac_dir=$1 @@ -14348,21 +14373,7 @@ $ac_dir/__uninstall__:: fi fi - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags fi if wine_fn_has_flag staticimplib $ac_flags @@ -14462,21 +14473,7 @@ else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__" - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \

1 0

Alexandre Julliard : makefiles: Add rules for building mo files.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 268976b9fe1f2a85c395f7941707cea96b9703fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=268976b9fe1f2a85c395f7941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 15:23:14 2011 +0200 makefiles: Add rules for building mo files. --- .gitignore | 1 + Make.rules.in | 7 +++- Make.vars.in | 2 + configure | 75 ++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 18 ++++++++++- tools/make_makefiles | 1 + 6 files changed, 98 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=268976b9fe1f2a85c395f…

1 0

Alexandre Julliard : wrc: Store the current po file in a global variable.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 421572298803f2da6628c5cfaccbacec4257a6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=421572298803f2da6628c5cfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 17:39:01 2011 +0200 wrc: Store the current po file in a global variable. --- tools/wrc/po.c | 70 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index e882a7c..fd55ba4 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -393,20 +393,17 @@ static const struct #ifndef HAVE_LIBGETTEXTPO -typedef void *po_file_t; - -static const char *get_msgstr( po_file_t po, const char *msgid, const char *context, int *found ) +static const char *get_msgstr( const char *msgid, const char *context, int *found ) { if (context) (*found)++; return msgid; } -static po_file_t read_po_file( const char *name ) +static void load_po_file( const char *name ) { - return NULL; } -static void po_file_free ( po_file_t po ) +static void free_po_file(void) { } @@ -422,6 +419,8 @@ void write_po_files( const char *outname ) #else /* HAVE_LIBGETTEXTPO */ +static po_file_t po_file; + static void po_xerror( int severity, po_message_t message, const char *filename, size_t lineno, size_t column, int multiline_p, const char *message_text ) @@ -474,13 +473,13 @@ static po_message_t find_message( po_file_t po, const char *msgid, const char *m return msg; } -static const char *get_msgstr( po_file_t po, const char *msgid, const char *context, int *found ) +static const char *get_msgstr( const char *msgid, const char *context, int *found ) { const char *ret = msgid; po_message_t msg; po_message_iterator_t iterator; - msg = find_message( po, msgid, context, &iterator ); + msg = find_message( po_file, msgid, context, &iterator ); if (msg && !po_message_is_fuzzy( msg )) { ret = po_message_msgstr( msg ); @@ -491,13 +490,16 @@ static const char *get_msgstr( po_file_t po, const char *msgid, const char *cont return ret; } -static po_file_t read_po_file( const char *name ) +static void load_po_file( const char *name ) { - po_file_t po; - - if (!(po = po_file_read( name, &po_xerror_handler ))) + if (!(po_file = po_file_read( name, &po_xerror_handler ))) error( "cannot load po file '%s'\n", name ); - return po; +} + +static void free_po_file(void) +{ + po_file_free( po_file ); + po_file = NULL; } static void add_po_string( po_file_t po, const string_t *msgid, const string_t *msgstr, @@ -818,7 +820,7 @@ void write_po_files( const char *outname ) #endif /* HAVE_LIBGETTEXTPO */ -static string_t *translate_string( po_file_t po, string_t *str, int *found ) +static string_t *translate_string( string_t *str, int *found ) { string_t *new; const char *transl; @@ -830,7 +832,7 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) msgid = buffer; context = get_message_context( &msgid ); - transl = get_msgstr( po, msgid, context, found ); + transl = get_msgstr( msgid, context, found ); new = xmalloc( sizeof(*new) ); new->type = str_unicode; @@ -844,7 +846,7 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) return new; } -static control_t *translate_controls( po_file_t po, control_t *ctrl, int *found ) +static control_t *translate_controls( control_t *ctrl, int *found ) { control_t *new, *head = NULL, *tail = NULL; @@ -856,7 +858,7 @@ static control_t *translate_controls( po_file_t po, control_t *ctrl, int *found { new->title = new_name_id(); *new->title = *ctrl->title; - new->title->name.s_name = translate_string( po, ctrl->title->name.s_name, found ); + new->title->name.s_name = translate_string( ctrl->title->name.s_name, found ); } else new->title = dup_name_id( ctrl->title ); new->ctlclass = dup_name_id( ctrl->ctlclass ); @@ -870,7 +872,7 @@ static control_t *translate_controls( po_file_t po, control_t *ctrl, int *found return head; } -static menu_item_t *translate_items( po_file_t po, menu_item_t *item, int *found ) +static menu_item_t *translate_items( menu_item_t *item, int *found ) { menu_item_t *new, *head = NULL, *tail = NULL; @@ -878,8 +880,8 @@ static menu_item_t *translate_items( po_file_t po, menu_item_t *item, int *found { new = xmalloc( sizeof(*new) ); *new = *item; - if (item->name) new->name = translate_string( po, item->name, found ); - if (item->popup) new->popup = translate_items( po, item->popup, found ); + if (item->name) new->name = translate_string( item->name, found ); + if (item->popup) new->popup = translate_items( item->popup, found ); if (tail) tail->next = new; else head = new; new->next = NULL; @@ -890,8 +892,7 @@ static menu_item_t *translate_items( po_file_t po, menu_item_t *item, int *found return head; } -static stringtable_t *translate_stringtable( po_file_t po, stringtable_t *stt, - language_t *lang, int *found ) +static stringtable_t *translate_stringtable( stringtable_t *stt, language_t *lang, int *found ) { stringtable_t *new, *head = NULL, *tail = NULL; int i; @@ -906,7 +907,7 @@ static stringtable_t *translate_stringtable( po_file_t po, stringtable_t *stt, memcpy( new->entries, stt->entries, new->nentries * sizeof(*new->entries) ); for (i = 0; i < stt->nentries; i++) if (stt->entries[i].str) - new->entries[i].str = translate_string( po, stt->entries[i].str, found ); + new->entries[i].str = translate_string( stt->entries[i].str, found ); if (tail) tail->next = new; else head = new; @@ -918,19 +919,19 @@ static stringtable_t *translate_stringtable( po_file_t po, stringtable_t *stt, return head; } -static void translate_dialog( po_file_t po, dialog_t *dlg, dialog_t *new, int *found ) +static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) { - if (dlg->title) new->title = translate_string( po, dlg->title, found ); + if (dlg->title) new->title = translate_string( dlg->title, found ); if (dlg->font) { new->font = xmalloc( sizeof(*dlg->font) ); new->font = dlg->font; - new->font->name = translate_string( po, dlg->font->name, found ); + new->font->name = translate_string( dlg->font->name, found ); } - new->controls = translate_controls( po, dlg->controls, found ); + new->controls = translate_controls( dlg->controls, found ); } -static void translate_resources( po_file_t po, language_t *lang ) +static void translate_resources( language_t *lang ) { resource_t *res; @@ -948,15 +949,15 @@ static void translate_resources( po_file_t po, language_t *lang ) break; case res_dlg: new = dup_resource( res, lang ); - translate_dialog( po, res->res.dlg, new->res.dlg, &found ); + translate_dialog( res->res.dlg, new->res.dlg, &found ); break; case res_men: new = dup_resource( res, lang ); - new->res.men->items = translate_items( po, res->res.men->items, &found ); + new->res.men->items = translate_items( res->res.men->items, &found ); break; case res_stt: new = dup_resource( res, lang ); - new->res.stt = translate_stringtable( po, res->res.stt, lang, &found ); + new->res.stt = translate_stringtable( res->res.stt, lang, &found ); break; case res_msg: /* FIXME */ @@ -978,7 +979,6 @@ static void translate_resources( po_file_t po, language_t *lang ) void add_translations( const char *po_dir ) { resource_t *res; - po_file_t po; char buffer[256]; char *p, *tok, *name; unsigned int i; @@ -1009,9 +1009,9 @@ void add_translations( const char *po_dir ) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.po", po_dir, tok ); - po = read_po_file( name ); - translate_resources( po, new_language(languages[i].id, languages[i].sub) ); - po_file_free( po ); + load_po_file( name ); + translate_resources( new_language(languages[i].id, languages[i].sub) ); + free_po_file(); free( name ); } }

1 0

Alexandre Julliard : wrc: Load translations from mo files instead of po.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: f4ec097c9b1f20e7ffd6aca6225c6a8a5fb1552a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ec097c9b1f20e7ffd6aca62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 18:21:04 2011 +0200 wrc: Load translations from mo files instead of po. --- Make.rules.in | 6 +- Make.vars.in | 2 +- configure | 7 ++- configure.ac | 5 +- tools/wrc/po.c | 171 ++++++++++++++++++++++++++++++++++++-------------- tools/wrc/wrc.c | 2 +- tools/wrc/wrc.man.in | 4 +- 7 files changed, 140 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4ec097c9b1f20e7ffd6a…

1 0

Alexandre Julliard : configure: Generate rules to update po files when gettextpo is explicitly requested.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 9159cfe0e62fc2e141bed5eeab8331c1288fa06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9159cfe0e62fc2e141bed5eea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 20:46:36 2011 +0200 configure: Generate rules to update po files when gettextpo is explicitly requested. --- aclocal.m4 | 2 +- configure | 20 ++++++++++++-------- configure.ac | 16 +++++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7a75fa9..887fef9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -204,7 +204,7 @@ wine_fn_pot_rules () ac_dir=$[1] ac_flags=$[2] - test "x$enable_maintainer_mode" = xyes || return + test "x$with_gettextpo" = xyes || return if wine_fn_has_flag mc $ac_flags then diff --git a/configure b/configure index 37d8cba..48978ca 100755 --- a/configure +++ b/configure @@ -1475,7 +1475,7 @@ Optional Packages: --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext - --without-gettextpo do not use the GetTextPO library + --with-gettextpo use the GetTextPO library to rebuild po files --without-gphoto do not use gphoto (Digital Camera support) --without-glu do not use the GLU library --without-gnutls do not use GnuTLS (schannel support) @@ -10549,11 +10549,11 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h fi fi - if test "x$LIBGETTEXTPO" = "x"; then : + test "x$with_gettextpo" != xyes || if test "x$LIBGETTEXTPO" = "x"; then : case "x$with_gettextpo" in - x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;; + x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; xno) ;; - *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported. + *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt. This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi @@ -14294,7 +14294,7 @@ wine_fn_pot_rules () ac_dir=$1 ac_flags=$2 - test "x$enable_maintainer_mode" = xyes || return + test "x$with_gettextpo" = xyes || return if wine_fn_has_flag mc $ac_flags then @@ -15430,10 +15430,14 @@ then \$(srcdir)/include/config.h.in: include/stamp-h.in \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 cd \$(srcdir) && autoheader --warnings=all - @echo timestamp > \$@ + @echo timestamp > \$@" +fi -ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot +if test "x$with_gettextpo" = xyes +then + test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES +\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" diff --git a/configure.ac b/configure.ac index 4b1f718..ad4f36f 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontcon [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) -AC_ARG_WITH(gettextpo, AS_HELP_STRING([--without-gettextpo],[do not use the GetTextPO library]), +AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]), [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi]) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), @@ -1440,7 +1440,8 @@ then [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(LIBGETTEXTPO,"-lgettextpo")]) fi - WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.]) + test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"], + [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi dnl **** Check for gstreamer **** @@ -3063,10 +3064,15 @@ then \$(srcdir)/include/config.h.in: include/stamp-h.in \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 cd \$(srcdir) && autoheader --warnings=all - @echo timestamp > \$[@] + @echo timestamp > \$[@]]) +fi -ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot +if test "x$with_gettextpo" = xyes +then + test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.]) + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[ALL_POT_FILES =$ALL_POT_FILES +\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)])

1 0

Aric Stewart : usp10: Correct itemizing multiple spaces at the beginning of a run.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 729de083f348dead7c2fa50518243288216058d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729de083f348dead7c2fa5051… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 11:28:54 2011 -0500 usp10: Correct itemizing multiple spaces at the beginning of a run. --- dlls/usp10/tests/usp10.c | 8 ++++++++ dlls/usp10/usp10.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1cf1463..6655ba6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -146,6 +146,10 @@ static void test_ScriptItemize( void ) static const itemTest t1b1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},4,0,0,0,-1}}; static const itemTest t1b2[2] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,0,0,0},4,0,0,0,-1}}; + static const WCHAR test1c[] = {' ', ' ', ' ', '1', '2', ' ',0}; + static const itemTest t1c1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},6,0,0,0,-1}}; + static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,1,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; + /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,0,0,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; @@ -291,6 +295,7 @@ static void test_ScriptItemize( void ) test_items_ok(test1,4,NULL,NULL,1,t11,FALSE,0); test_items_ok(test1b,4,NULL,NULL,1,t1b1,FALSE,0); + test_items_ok(test1c,6,NULL,NULL,1,t1c1,FALSE,0); test_items_ok(test2,16,NULL,NULL,6,t21,FALSE,0); test_items_ok(test2b,11,NULL,NULL,4,t2b1,FALSE,0); test_items_ok(test2c,11,NULL,NULL,4,t2c1,FALSE,0); @@ -316,6 +321,7 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b1,FALSE,0); + test_items_ok(test1c,6,&Control,&State,1,t1c1,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t22,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b1,FALSE,0); test_items_ok(test2c,11,&Control,&State,5,t2c2,FALSE,0); @@ -341,6 +347,7 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); + test_items_ok(test1c,6,&Control,&State,3,t1c2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b2,FALSE,0); test_items_ok(test2c,11,&Control,&State,4,t2c3,FALSE,0); @@ -367,6 +374,7 @@ static void test_ScriptItemize( void ) Control.fMergeNeutralItems = TRUE; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); + test_items_ok(test1c,6,&Control,&State,3,t1c2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,2,t2b3,FALSE,4); test_items_ok(test2c,11,&Control,&State,2,t2c4,FALSE,4); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4b03835..05468eb 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -772,7 +772,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int #define ZWJ 0x200D int cnt = 0, index = 0, str = 0; - int New_Script = SCRIPT_UNDEFINED; + int New_Script = -1; WORD *levels = NULL; WORD *strength = NULL; WORD baselevel = 0; @@ -859,7 +859,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int New_Script = get_char_script(pwcInChars[cnt+j]); } - if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || New_Script != pItems[index].a.eScript || New_Script == Script_Control) + if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control) { TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript);

1 0

Aric Stewart : msctf: Increase buffer to have room for full key.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: d5090fd9757fbee2190eaa0f54ea39ebcfe657e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5090fd9757fbee2190eaa0f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 20:26:40 2011 -0500 msctf: Increase buffer to have room for full key. --- dlls/msctf/categorymgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 7c19c12..a487404 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -203,7 +203,7 @@ static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, { static const WCHAR fmt[] = { '%','s','\\','%','s','\\','C','a','t','e','g','o','r','y','\\','I','t','e','m','\\','%','s',0}; - WCHAR fullkey[110]; + WCHAR fullkey[120]; WCHAR buf[39]; HKEY key; HRESULT hr = S_FALSE;

1 0

Aric Stewart : user32: Use Uniscribe in the multiline edit control.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 3b5e14a9b0a925052e2b1b71f76a7f1eff6d84bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5e14a9b0a925052e2b1b71f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 11:29:05 2011 -0500 user32: Use Uniscribe in the multiline edit control. --- dlls/user32/edit.c | 252 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 160 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b5e14a9b0a925052e2b1…

1 0

Juan Lang : wininet: Accept RFC 850 dates in HTTP headers.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: aeca2f98fa6086b0a83d9acece336e91a6a6df6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeca2f98fa6086b0a83d9acec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 21 22:55:14 2011 -0700 wininet: Accept RFC 850 dates in HTTP headers. --- dlls/wininet/http.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 134 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50630ba..d1a870b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3989,7 +3989,7 @@ static void HTTP_InsertCookies(http_request_t *request) heap_free(cookies); } -static WORD HTTP_ParseDay(LPCWSTR day) +static WORD HTTP_ParseWkday(LPCWSTR day) { static const WCHAR days[7][4] = {{ 's','u','n',0 }, { 'm','o','n',0 }, @@ -4107,7 +4107,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) dayPtr - day < sizeof(day) / sizeof(day[0]) - 1; ptr++, dayPtr++) *dayPtr = *ptr; *dayPtr = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek >= 7) { ERR("unexpected weekday %s\n", debugstr_w(day)); @@ -4186,15 +4186,15 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return FALSE; if (ptr - value != 3) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[3] = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek > 6) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } ptr++; @@ -4205,7 +4205,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) num = strtoulW(ptr, &nextPtr, 10); if (!nextPtr || nextPtr <= ptr || !num || num > 31) { - ERR("unexpected day %s\n", debugstr_w(value)); + WARN("unexpected day %s\n", debugstr_w(value)); return FALSE; } ptr = nextPtr; @@ -4222,7 +4222,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) st.wMonth = HTTP_ParseMonth(month); if (!st.wMonth || st.wMonth > 12) { - ERR("unexpected month %s\n", debugstr_w(month)); + WARN("unexpected month %s\n", debugstr_w(month)); return FALSE; } @@ -4252,11 +4252,125 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return SystemTimeToFileTime(&st, ft); } -/* FIXME: only accepts dates in RFC 1123 format and asctime() format, - * which may not be the only formats actually seen in the wild. - * http://www.hackcraft.net/web/datetime/ suggests at least RFC 850 dates - * should be accepted as well. - */ +static WORD HTTP_ParseWeekday(LPCWSTR day) +{ + static const WCHAR days[7][10] = {{ 's','u','n','d','a','y',0 }, + { 'm','o','n','d','a','y',0 }, + { 't','u','e','s','d','a','y',0 }, + { 'w','e','d','n','e','s','d','a','y',0 }, + { 't','h','u','r','s','d','a','y',0 }, + { 'f','r','i','d','a','y',0 }, + { 's','a','t','u','r','d','a','y',0 }}; + int i; + for (i = 0; i < sizeof(days)/sizeof(*days); i++) + if (!strcmpiW(day, days[i])) + return i; + + /* Invalid */ + return 7; +} + +static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) +{ + static const WCHAR gmt[]= { 'G','M','T',0 }; + WCHAR *nextPtr, day[10], month[4], *monthPtr; + LPCWSTR ptr; + unsigned long num; + SYSTEMTIME st = { 0 }; + + ptr = strchrW(value, ','); + if (!ptr) + return FALSE; + if (ptr - value == 3) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[3] = 0; + st.wDayOfWeek = HTTP_ParseWkday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else if (ptr - value <= sizeof(day) / sizeof(day[0])) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[ptr - value + 1] = 0; + st.wDayOfWeek = HTTP_ParseWeekday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + ptr++; + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || !num || num > 31) + { + ERR("unexpected day %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wDay = (WORD)num; + + if (*ptr != '-') + { + ERR("unexpected month format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + for (monthPtr = month; *ptr != '-' && + monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + monthPtr++, ptr++) + *monthPtr = *ptr; + *monthPtr = 0; + st.wMonth = HTTP_ParseMonth(month); + if (!st.wMonth || st.wMonth > 12) + { + ERR("unexpected month %s\n", debugstr_w(month)); + return FALSE; + } + + if (*ptr != '-') + { + ERR("unexpected year format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || num < 1601 || num > 30827) + { + ERR("unexpected year %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wYear = (WORD)num; + + if (!HTTP_ParseTime(&st, &ptr)) + return FALSE; + + while (isspaceW(*ptr)) + ptr++; + + if (strcmpW(ptr, gmt)) + { + ERR("unexpected time zone %s\n", debugstr_w(ptr)); + return FALSE; + } + return SystemTimeToFileTime(&st, ft); +} + static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { static const WCHAR zero[] = { '0',0 }; @@ -4268,7 +4382,15 @@ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) ret = TRUE; } else if (strchrW(value, ',')) + { ret = HTTP_ParseRfc1123Date(value, ft); + if (!ret) + { + ret = HTTP_ParseRfc850Date(value, ft); + if (!ret) + ERR("unexpected date format %s\n", debugstr_w(value)); + } + } else { ret = HTTP_ParseDateAsAsctime(value, ft);

1 0

Henri Verbeet : wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem ().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 4229d865d27dd81c23c8bbb72cd834cf0d659609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229d865d27dd81c23c8bbb72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:57 2011 +0200 wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem(). --- dlls/wined3d/surface.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54cacbd..54b46b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5809,9 +5809,15 @@ static void surface_load_sysmem(struct wined3d_surface *surface, return; } - /* Note: It might be faster to download into a texture first. */ - read_from_framebuffer(surface, rect, surface->resource.allocatedMemory, - wined3d_surface_get_pitch(surface)); + if (surface->flags & SFLAG_INDRAWABLE) + { + read_from_framebuffer(surface, rect, surface->resource.allocatedMemory, + wined3d_surface_get_pitch(surface)); + return; + } + + FIXME("Can't load surface %p with location flags %#x into sysmem.\n", + surface, surface->flags & SFLAG_LOCATIONS); } static HRESULT surface_load_drawable(struct wined3d_surface *surface,

1 0