January 2011 - Wine-commits

Alexandre Julliard : wmc: Add support for generating message translations based on po files.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 72921af40b72c31f29dbc8f8b656f431e6457a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72921af40b72c31f29dbc8f8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:12:54 2011 +0100 wmc: Add support for generating message translations based on po files. --- tools/wmc/po.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wmc/wmc.c | 9 +++- tools/wmc/wmc.man.in | 6 ++ tools/wmc/wmctypes.h | 1 + tools/wmc/write.c | 2 +- tools/wmc/write.h | 1 + 6 files changed, 158 insertions(+), 2 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index e9969ef..414e4a6 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -435,6 +435,143 @@ void write_pot_file( const char *outname ) po_file_free( po ); } +static lan_blk_t *new_top, *new_tail; + +static lanmsg_t *translate_string( po_file_t po, lanmsg_t *str, int lang, int *found ) +{ + po_message_t msg; + po_message_iterator_t iterator; + lanmsg_t *new; + const char *transl; + int res; + char *buffer, *msgid, *context; + + if (str->len <= 1 || !(buffer = convert_msgid_ascii( str, 0 ))) return str; + + msgid = buffer; + context = get_message_context( &msgid ); + msg = find_message( po, msgid, context, &iterator ); + po_message_iterator_free( iterator ); + + if (msg && !po_message_is_fuzzy( msg )) + { + transl = po_message_msgstr( msg ); + if (!transl[0]) transl = msgid; /* ignore empty strings */ + else (*found)++; + } + else transl = msgid; + + new = xmalloc( sizeof(*new) ); + new->lan = lang; + new->cp = 0; /* FIXME */ + new->file = str->file; + new->line = str->line; + new->len = wine_utf8_mbstowcs( 0, transl, strlen(transl) + 1, NULL, 0 ); + new->msg = xmalloc( new->len * sizeof(WCHAR) ); + res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); + if (res == -2) + error( "Invalid utf-8 character in string '%s'\n", transl ); + free( buffer ); + return new; +} + +static void translate_block( po_file_t po, block_t *blk, block_t *new, int lang, int *found ) +{ + int i; + + new->idlo = blk->idlo; + new->idhi = blk->idhi; + new->size = 0; + new->msgs = xmalloc( blk->nmsg * sizeof(*new->msgs) ); + new->nmsg = blk->nmsg; + for (i = 0; i < blk->nmsg; i++) + { + new->msgs[i] = translate_string( po, blk->msgs[i], lang, found ); + new->size += ((2 * new->msgs[i]->len + 3) & ~3) + 4; + } +} + +static void translate_messages( po_file_t po, int lang ) +{ + int i, found; + lan_blk_t *lbp, *new; + + for (lbp = lanblockhead; lbp; lbp = lbp->next) + { + if (!is_english( lbp->lan )) continue; + found = 0; + new = xmalloc( sizeof(*new) ); + /* English "translations" take precedence over the original contents */ + new->version = is_english( lang ) ? 1 : -1; + new->lan = lang; + new->blks = xmalloc( lbp->nblk * sizeof(*new->blks) ); + new->nblk = lbp->nblk; + + for (i = 0; i < lbp->nblk; i++) + translate_block( po, &lbp->blks[i], &new->blks[i], lang, &found ); + if (found) + { + if (new_tail) new_tail->next = new; + else new_top = new; + new->prev = new_tail; + new_tail = new; + } + else + { + free( new->blks ); + free( new ); + } + } +} + +void add_translations( const char *po_dir ) +{ + lan_blk_t *lbp; + po_file_t po; + char buffer[256]; + char *p, *tok, *name; + unsigned int i; + FILE *f; + + /* first check if we have English resources to translate */ + for (lbp = lanblockhead; lbp; lbp = lbp->next) if (is_english( lbp->lan )) break; + if (!lbp) return; + + new_top = new_tail = NULL; + + name = strmake( "%s/LINGUAS", po_dir ); + if (!(f = fopen( name, "r" ))) return; + free( name ); + while (fgets( buffer, sizeof(buffer), f )) + { + if ((p = strchr( buffer, '#' ))) *p = 0; + for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) + { + for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + if (!strcmp( tok, languages[i].name )) break; + + if (i == sizeof(languages)/sizeof(languages[0])) + error( "unknown language '%s'\n", tok ); + + name = strmake( "%s/%s.po", po_dir, tok ); + if (!(po = po_file_read( name, &po_xerror_handler ))) + error( "cannot load po file for language '%s'\n", tok ); + translate_messages( po, MAKELANGID(languages[i].id, languages[i].sub) ); + po_file_free( po ); + free( name ); + } + } + fclose( f ); + + /* prepend the translated messages to the global list */ + if (new_tail) + { + new_tail->next = lanblockhead; + lanblockhead->prev = new_tail; + lanblockhead = new_top; + } +} + #else /* HAVE_LIBGETTEXTPO */ void write_pot_file( const char *outname ) @@ -442,4 +579,8 @@ void write_pot_file( const char *outname ) error( "PO files not supported in this wmc build\n" ); } +void add_translations( const char *po_dir ) +{ +} + #endif diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 1dde0d8..837cfa6 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -49,6 +49,7 @@ static const char usage[] = " -i Inline messagetable(s)\n" " -o file Output to file (default is inputfile.rc)\n" " -O fmt Set output format (rc, res, pot)\n" + " -P dir Directory where to find po files\n" " -u Inputfile is in unicode\n" " -U Output unicode messagetable(s)\n" " -v Show supported codepages and languages\n" @@ -104,6 +105,8 @@ int rcinline = 0; */ static int dodebug = 0; +static char *po_dir; + char *output_name = NULL; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ char *header_name = NULL; /* The name given by the -H option */ @@ -173,7 +176,7 @@ int main(int argc,char *argv[]) strcat(cmdline, " "); } - while((optc = getopt(argc, argv, "B:cdDhH:io:O:p:uUvVW")) != EOF) + while((optc = getopt(argc, argv, "B:cdDhH:io:O:P:uUvVW")) != EOF) { switch(optc) { @@ -229,6 +232,9 @@ int main(int argc,char *argv[]) lose++; } break; + case 'P': + po_dir = xstrdup( optarg ); + break; case 'u': unicodein = 1; break; @@ -319,6 +325,7 @@ int main(int argc,char *argv[]) write_bin_files(); break; case FORMAT_RES: + if (po_dir) add_translations( po_dir ); write_res_file( output_name ); break; case FORMAT_POT: diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index ed8b69c..74542a5 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -52,6 +52,12 @@ Output to \fIfile\fR. Default is \fIinputfile.rc\fR. Set the output format. Supported formats are \fBrc\fR (the default), \fBres\fR, and \fBpot\fR. .TP +.BI \-P\ directory +Enable the generation of resource translations based on po files +loaded from the specified directory. That directory must follow the +gettext convention, in particular in must contain one .po file for +each language, and a LINGUAS file listing the available languages. +.TP .B \-u Assume that the inputfile is in unicode. .TP diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 483507a..6c9a97c 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -117,6 +117,7 @@ typedef struct lan_blk { struct lan_blk *next; /* Linkage for languages */ struct lan_blk *prev; int lan; /* The language of this block */ + int version; /* The resource version for auto-translated resources */ block_t *blks; /* Array of blocks for this language */ int nblk; /* Nr of blocks in array */ } lan_blk_t; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index f6e6d52..0fc38ad 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -620,7 +620,7 @@ void write_res_file( const char *name ) put_dword( 0 ); /* DataVersion */ put_word( 0x30 ); /* Memory options */ put_word( lbp->lan ); /* Language */ - put_dword( 0 ); /* Version */ + put_dword( lbp->version ); /* Version */ put_dword( 0 ); /* Characteristics */ output_bin_data( lbp ); diff --git a/tools/wmc/write.h b/tools/wmc/write.h index 745098b..8451e0b 100644 --- a/tools/wmc/write.h +++ b/tools/wmc/write.h @@ -25,5 +25,6 @@ void write_rc_file(const char *fname); void write_bin_files(void); void write_res_file( const char *name ); void write_pot_file( const char *outname ); +void add_translations( const char *po_dir ); #endif

1 0

Alexandre Julliard : makefiles: Add rules to update po files from . mc files in maintainer mode.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 417b70bf44f326f0b2ad27f2ab41c96f81581a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=417b70bf44f326f0b2ad27f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 21:23:03 2011 +0100 makefiles: Add rules to update po files from .mc files in maintainer mode. --- .gitignore | 1 + Make.rules.in | 12 ++++++++---- aclocal.m4 | 30 ++++++++++++++++++++++++------ configure | 32 +++++++++++++++++++++++++------- configure.ac | 2 +- tools/make_makefiles | 3 +++ 6 files changed, 62 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index d91e568..0a6a589 100644 --- a/.gitignore +++ b/.gitignore @@ -251,6 +251,7 @@ loader/wine-installed loader/wine-preloader loader/wine64 loader/wine64-preloader +msg.pot programs/Makeprog.rules programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/Make.rules.in b/Make.rules.in index f44bc55..cd9c22e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -26,7 +26,8 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= CLEAN_FILES = *.o *.a *.so *.ln *.res *.fake *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ - $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(PO_SRCS:%=rsrc.pot) + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ + $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) @@ -59,7 +60,7 @@ filter: dummy $(FLEX) $(LEXFLAGS) -o$@ $< .mc.res: - $(LDPATH) $(WMC) -U -O res -o $@ $< + $(LDPATH) $(WMC) -U -O res -P $(top_srcdir)/po -o $@ $< .rc.res: $(LDPATH) $(WRC) $(RCFLAGS) -o $@ $< @@ -176,12 +177,15 @@ install install-lib install-dev uninstall:: # Rules for resources -all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) +all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) rsrc.pot: $(WRC) $(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) -$(MC_SRCS:.mc=.res): $(WMC) +msg.pot: $(WMC) + $(LDPATH) $(WMC) -O pot -o $@ $(MC_SRCS) + +$(MC_SRCS:.mc=.res): $(WMC) $(ALL_PO_FILES) $(RC_SRCS:.rc=.res): $(WRC) $(PO_SRCS:.rc=.res): $(ALL_PO_FILES) diff --git a/aclocal.m4 b/aclocal.m4 index 79486ab..234a6b8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -269,11 +269,20 @@ install-lib:: $ac_dir/Makefile __builddeps__ uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$[@]" - if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags + if test "x$enable_maintainer_mode" = xyes then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + 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]) if wine_fn_has_flag staticimplib $ac_flags @@ -346,11 +355,20 @@ wine_fn_config_program () $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE)" - if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags + if test "x$enable_maintainer_mode" = xyes then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + 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_has_flag install $ac_flags || return diff --git a/configure b/configure index 1ea906d..a3b5ad9 100755 --- a/configure +++ b/configure @@ -14529,11 +14529,20 @@ install-lib:: $ac_dir/Makefile __builddeps__ uninstall manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) \$@" - if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags + if test "x$enable_maintainer_mode" = xyes then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + 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 fi @@ -14610,11 +14619,20 @@ else $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE)" - if test "x$enable_maintainer_mode" = xyes && wine_fn_has_flag po $ac_flags + if test "x$enable_maintainer_mode" = xyes then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + 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_has_flag install $ac_flags || return @@ -15004,7 +15022,7 @@ wine_fn_config_dll itss enable_itss wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll jscript enable_jscript po wine_fn_config_test dlls/jscript/tests jscript_test -wine_fn_config_dll kernel32 enable_kernel32 implib +wine_fn_config_dll kernel32 enable_kernel32 mc,implib wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel diff --git a/configure.ac b/configure.ac index 4d049b6..a7a1339 100644 --- a/configure.ac +++ b/configure.ac @@ -2533,7 +2533,7 @@ WINE_CONFIG_DLL(itss) WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(jscript,,[po]) WINE_CONFIG_TEST(dlls/jscript/tests) -WINE_CONFIG_DLL(kernel32,,[implib]) +WINE_CONFIG_DLL(kernel32,,[mc,implib]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 991ef4b..182aef5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -96,6 +96,7 @@ my @ignores = ( "*/*/tests/testlist.c", "include/config.h", "include/stamp-h", + "msg.pot", "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", "programs/winetest/build.nfo", @@ -424,6 +425,7 @@ sub update_makefiles(@) die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll"; } my $implib = $make{"IMPORTLIB"} || ""; + push @flags, "mc" if defined $make{"MC_SRCS"}; push @flags, "po" if defined $make{"PO_SRCS"}; push @flags, "implib" if $implib; push @flags, "staticimplib" if defined($make{"IMPLIB_SRCS"}); @@ -444,6 +446,7 @@ sub update_makefiles(@) { die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe"; } + push @flags, "mc" if defined $make{"MC_SRCS"}; push @flags, "po" if defined $make{"PO_SRCS"}; push @flags, "install" unless $dont_install{$name}; push @flags, "installbin" if $bin_install{$name};

1 0

Andrew Nguyen : server: Filter the WOW64 registry access flags before performing the access check.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: ed657182ee3a9f39a1093564eecaeb472423bc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed657182ee3a9f39a1093564e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 24 07:09:41 2011 -0600 server: Filter the WOW64 registry access flags before performing the access check. --- dlls/advapi32/tests/registry.c | 173 ++++++++++++++++++++++++++++++++++++++++ server/registry.c | 4 +- 2 files changed, 176 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed657182ee3a9f39a1093…

1 0

Hans Leidekker : msi: Don't interpret assembly name attributes.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 3eaf33fff7132db64ba0a27b0f1f86e0250551fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaf33fff7132db64ba0a27b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:21:45 2011 +0100 msi: Don't interpret assembly name attributes. --- dlls/msi/assembly.c | 126 +++++++++++++------------------------------------- 1 files changed, 33 insertions(+), 93 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 539855c..f59d2eb 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -128,58 +128,31 @@ MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) struct assembly_name { - WCHAR *type; - WCHAR *name; - WCHAR *version; - WCHAR *culture; - WCHAR *token; - WCHAR *arch; + UINT count; + UINT index; + WCHAR **attrs; }; static UINT get_assembly_name_attribute( MSIRECORD *rec, LPVOID param ) { - static const WCHAR typeW[] = {'t','y','p','e',0}; + static const WCHAR fmtW[] = {'%','s','=','"','%','s','"',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; - static const WCHAR cultureW[] = {'c','u','l','t','u','r','e',0}; - static const WCHAR tokenW[] = {'p','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; - static const WCHAR archW[] = {'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e',0}; struct assembly_name *name = param; const WCHAR *attr = MSI_RecordGetString( rec, 2 ); - WCHAR *value = msi_dup_record_field( rec, 3 ); - - if (!strcmpiW( attr, typeW )) - name->type = value; - else if (!strcmpiW( attr, nameW )) - name->name = value; - else if (!strcmpiW( attr, versionW )) - name->version = value; - else if (!strcmpiW( attr, cultureW )) - name->culture = value; - else if (!strcmpiW( attr, tokenW )) - name->token = value; - else if (!strcmpiW( attr, archW )) - name->arch = value; - else - msi_free( value ); + const WCHAR *value = MSI_RecordGetString( rec, 3 ); + int len = strlenW( fmtW ) + strlenW( attr ) + strlenW( value ); + + if (!(name->attrs[name->index] = msi_alloc( len * sizeof(WCHAR) ))) + return ERROR_OUTOFMEMORY; + if (!strcmpiW( attr, nameW )) strcpyW( name->attrs[name->index++], value ); + else sprintfW( name->attrs[name->index++], fmtW, attr, value ); return ERROR_SUCCESS; } static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSIASSEMBLY *assembly ) { - static const WCHAR fmt_netW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'c','u','l','t','u','r','e','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; - static const WCHAR fmt_sxsW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',',',' ', - 'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=','%','s',0}; - static const WCHAR fmt_sxs_localW[] = { - '%','s',',',' ','v','e','r','s','i','o','n','=','%','s',',',' ', - 'c','u','l','t','u','r','e','=','%','s',',',' ', - 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; + static const WCHAR commaW[] = {',',0}; static const WCHAR queryW[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','M','s','i','A','s','s','e','m','b','l','y','N','a','m','e','`',' ', @@ -188,75 +161,42 @@ static WCHAR *get_assembly_display_name( MSIDATABASE *db, const WCHAR *comp, MSI struct assembly_name name; WCHAR *display_name = NULL; MSIQUERY *view; + UINT i, r; int len; - UINT r; - - memset( &name, 0, sizeof(name) ); r = MSI_OpenQuery( db, &view, queryW, comp ); if (r != ERROR_SUCCESS) return NULL; + name.count = 0; + name.index = 0; + name.attrs = NULL; + MSI_IterateRecords( view, &name.count, NULL, NULL ); + if (!name.count) goto done; + + name.attrs = msi_alloc( name.count * sizeof(WCHAR *) ); + if (!name.attrs) goto done; + MSI_IterateRecords( view, NULL, get_assembly_name_attribute, &name ); - msiobj_release( &view->hdr ); - if (assembly->attributes == msidbAssemblyAttributesWin32) - { - if (!assembly->application) - { - if (!name.type || !name.name || !name.version || !name.token || !name.arch) - { - WARN("invalid global win32 assembly name\n"); - goto done; - } - len = strlenW( fmt_sxsW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.token ); - len += strlenW( name.arch ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_sxsW, name.name, name.version, name.token, name.arch ); - } - else - { - if (!name.name || !name.version || !name.culture || !name.token) - { - WARN("invalid local win32 assembly name\n"); - goto done; - } - len = strlenW( fmt_sxs_localW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.culture ); - len += strlenW( name.token ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_sxs_localW, name.name, name.version, name.culture, name.token ); - } - } - else + len = 0; + for (i = 0; i < name.count; i++) len += strlenW( name.attrs[i] ) + 1; + + display_name = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (display_name) { - if (!name.name || !name.version || !name.culture || !name.token) + display_name[0] = 0; + for (i = 0; i < name.count; i++) { - WARN("invalid assembly name\n"); - goto done; + strcatW( display_name, name.attrs[i] ); + if (i < name.count - 1) strcatW( display_name, commaW ); } - len = strlenW( fmt_netW ); - len += strlenW( name.name ); - len += strlenW( name.version ); - len += strlenW( name.culture ); - len += strlenW( name.token ); - if (!(display_name = msi_alloc( len * sizeof(WCHAR) ))) goto done; - sprintfW( display_name, fmt_netW, name.name, name.version, name.culture, name.token ); } done: - msi_free( name.type ); - msi_free( name.name ); - msi_free( name.version ); - msi_free( name.culture ); - msi_free( name.token ); - msi_free( name.arch ); - + msiobj_release( &view->hdr ); + for (i = 0; i < name.count; i++) msi_free( name.attrs[i] ); + msi_free( name.attrs ); return display_name; }

1 0

Hans Leidekker : msi: Implement the MsiPublishAssemblies and MsiUnpublishAssemblies standard actions .
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 92203f10530645792a1ad5964d00b4fefba04de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92203f10530645792a1ad5964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:22:11 2011 +0100 msi: Implement the MsiPublishAssemblies and MsiUnpublishAssemblies standard actions. --- dlls/msi/action.c | 7 -- dlls/msi/assembly.c | 239 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/tests/action.c | 6 +- 4 files changed, 237 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92203f10530645792a1ad…

1 0

Hans Leidekker : wininet/tests: Trace errors from InternetReadFile in test_basic_request.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 86eb9c24f14b3e44739ee8102c840ec9ccc77e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86eb9c24f14b3e44739ee8102… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 24 15:22:31 2011 +0100 wininet/tests: Trace errors from InternetReadFile in test_basic_request. --- dlls/wininet/tests/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8b4da71..4bced99 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1823,8 +1823,9 @@ static void test_basic_request(int port, const char *verb, const char *url) count = 0; memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed\n"); + ok(r, "InternetReadFile failed %u\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n");

1 0

Alexandre Julliard : dbghelp: Use Dwarf debug info even when part of it is missing.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 9926ca771b7fb0d8f217f5115919e16d5f8c676b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9926ca771b7fb0d8f217f5115… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 15:52:42 2011 +0100 dbghelp: Use Dwarf debug info even when part of it is missing. --- dlls/dbghelp/dwarf.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d60a5fd..e02e654 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3174,31 +3174,29 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) { - dwarf2_section_t section[section_max]; + dwarf2_section_t eh_frame, section[section_max]; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, - debug_line_sect, debug_ranges_sect; + debug_line_sect, debug_ranges_sect, eh_frame_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect)) - /* no Dwarf debug info here */ - return FALSE; - + dwarf2_init_section(&eh_frame, fmap, ".eh_frame", &eh_frame_sect); + dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect); dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); - if (section[section_debug].address == IMAGE_NO_MAP || - section[section_abbrev].address == IMAGE_NO_MAP || - section[section_string].address == IMAGE_NO_MAP) + /* to do anything useful we need either .eh_frame or .debug_info */ + if ((!eh_frame.address || eh_frame.address == IMAGE_NO_MAP) && + (!section[section_debug].address || section[section_debug].address == IMAGE_NO_MAP)) { ret = FALSE; goto leave; } - if (fmap->modtype == DMT_ELF) + if (fmap->modtype == DMT_ELF && debug_sect.fmap) { /* debug info might have a different base address than .so file * when elf file is prelinked after splitting off debug info @@ -3232,7 +3230,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, */ dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->eh_frame, fmap, ".eh_frame", NULL); + dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; while (mod_ctx.data < mod_ctx.end_data) { @@ -3252,6 +3250,7 @@ leave: image_unmap_section(&debug_str_sect); image_unmap_section(&debug_line_sect); image_unmap_section(&debug_ranges_sect); + if (!ret) image_unmap_section(&eh_frame_sect); return ret; }

1 0

Mike Kaplinskiy : ws2_32: Finish an overlapped send only if we sent everything.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: 27b51ce6b06e5673259d6a4ac917c0847d49f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b51ce6b06e5673259d6a4ac… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jan 24 00:19:25 2011 -0500 ws2_32: Finish an overlapped send only if we sent everything. --- dlls/ws2_32/socket.c | 10 +++++++--- dlls/ws2_32/tests/sock.c | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 66def56..774481d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1806,7 +1806,11 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (result >= 0) { - status = STATUS_SUCCESS; + if (wsa->first_iovec < wsa->n_iovecs) + status = STATUS_PENDING; + else + status = STATUS_SUCCESS; + iosb->Information += result; } else if (errno == EINTR || errno == EAGAIN) @@ -3906,10 +3910,10 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, wsa->completion_func = lpCompletionRoutine; release_sock_fd( s, fd ); - if (n == -1) + if (n == -1 || n < totalLength) { iosb->u.Status = STATUS_PENDING; - iosb->Information = 0; + iosb->Information = n == -1 ? 0 : n; SERVER_START_REQ( register_async ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 77925b5..df6bff8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2848,10 +2848,8 @@ static void test_send(void) bytes_sent = 0; ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - todo_wine ok((ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), + ok((ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); - if ( (ret != SOCKET_ERROR || GetLastError() != ERROR_IO_PENDING) && bytes_sent < buflen ) - goto end; /* don't check for completion yet, we may need to drain the buffer while still sending */ set_blocking(src, FALSE);

1 0

Nikolay Sivov : oleaut32: Fix a couple of leaks on typeinfo release ( Valgrind).
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: a6de06aa4c92cb1454b9c6b3d5a6a7e93b286368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6de06aa4c92cb1454b9c6b3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 24 07:27:43 2011 +0300 oleaut32: Fix a couple of leaks on typeinfo release (Valgrind). --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b1e3e4f..cc3497e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5030,6 +5030,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); heap_free(elemdesc->u.paramdesc.pparamdescex); } + TLB_FreeCustData(pFInfo->pParamDesc[i].pCustData); SysFreeString(pFInfo->pParamDesc[i].Name); } heap_free(pFInfo->funcdesc.lprgelemdescParam); @@ -5052,6 +5053,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) } TLB_FreeCustData(pVInfo->pCustData); SysFreeString(pVInfo->Name); + SysFreeString(pVInfo->HelpString); pVInfoNext = pVInfo->next; heap_free(pVInfo); }

1 0

Mike Kaplinskiy : server: Fix connect failures on newer kernels.
by Alexandre Julliard 24 Jan '11

24 Jan '11

Module: wine Branch: master Commit: f58c709b5f82ec6c850a723437933bbc21327da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58c709b5f82ec6c850a72343… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Jan 24 00:21:15 2011 -0500 server: Fix connect failures on newer kernels. --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index df6bff8..9d1de46 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4026,7 +4026,7 @@ static void test_ConnectEx(void) closesocket(listener); listener = INVALID_SOCKET; - address.sin_port = 1; + address.sin_port = htons(1); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && GetLastError(), "ConnectEx to bad destination failed: " diff --git a/server/sock.c b/server/sock.c index d37a316..b0efc16 100644 --- a/server/sock.c +++ b/server/sock.c @@ -388,18 +388,18 @@ static void sock_poll_event( struct fd *fd, int event ) if (sock->state & FD_CONNECT) { - /* connecting */ - if (event & POLLOUT) + if (event & (POLLERR|POLLHUP)) { - /* we got connected */ - sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + /* we didn't get connected? */ sock->state &= ~FD_CONNECT; + event &= ~POLLOUT; + error = sock_error( fd ); } - else if (event & (POLLERR|POLLHUP)) + else if (event & POLLOUT) { - /* we didn't get connected? */ + /* we got connected */ + sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; sock->state &= ~FD_CONNECT; - error = sock_error( fd ); } } else if (sock->state & FD_WINE_LISTENING)

1 0