June 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : Update the mailing lists traffic stats.
by Jeremy Newman 09 Jun '10

09 Jun '10

Module: website Branch: master Commit: a5b773a734e2911315e23fb52cf5cee74837fbd7 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5b773a734e2911315e23f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 10 00:00:07 2010 +0200 Update the mailing lists traffic stats. Traffic stats gathered from the archives for the last 12 months. The wine-bugs number was waay off. --- templates/en/forums.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f8a04a0..e427d50 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -57,7 +57,7 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] [<a href="http://forum.winehq.org">via web forums</a>] <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> - A high traffic (50/day) open list for end-user discussions. + A medium traffic (50/day) open list for end-user discussions. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] @@ -74,7 +74,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (30/day) open list for submitting patches only. + A medium traffic (45/day) open list for submitting patches only. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] @@ -82,7 +82,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (25/day) read only list which tracks commits to the Git + A medium traffic (35/day) read only list which tracks commits to the Git tree. <li> @@ -105,7 +105,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - A medium traffic (10/day) read-only list for monitoring submissions to the + A high traffic (150/day) read-only list for monitoring activity on the <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. <li>

1 0

Paul Vriens : comdlg32: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: a2b21781e30d6b0addc324040f406ce6af1370ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b21781e30d6b0addc324040… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 17:25:38 2010 +0200 comdlg32: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/comdlg32/cdlg_Da.rc | 151 +++++++++++++++++++++++---------------------- 1 files changed, 77 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b21781e30d6b0addc32…

1 0

Matteo Bruni : d3dx9: Mark builtin compatibility declarations in the shader assembler.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 9a8ffc916cb1f65e2118c7deba11bc91a4e7cc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8ffc916cb1f65e2118c7deb… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:35:10 2010 +0200 d3dx9: Mark builtin compatibility declarations in the shader assembler. This way we can output declarations in the bytecode without polluting them with the builtin ones. --- dlls/d3dx9_36/asmparser.c | 50 +++++++++++++++++++------------------- dlls/d3dx9_36/bytecodewriter.c | 12 ++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 5 +++- 3 files changed, 40 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a8ffc916cb1f65e2118c…

1 0

Matteo Bruni : d3dx9: Support ps_2_0-style dcl instruction in the shader assembler.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 00951f84ed6acddc79230bde63edbbda0dba7e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00951f84ed6acddc79230bde6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:50:57 2010 +0200 d3dx9: Support ps_2_0-style dcl instruction in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 23 +++++++++++++++++++++-- dlls/d3dx9_36/asmshader.y | 34 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 25 ++++++++++++++----------- dlls/d3dx9_36/tests/asm.c | 13 +++++++++++++ 4 files changed, 82 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 071a1b8..b20479a 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -133,6 +133,25 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, } } +static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD num, + DWORD mod, const struct shader_reg *reg) { + struct instruction instr; + + if(!This->shader) return; + if(usage != 0) { + asmparser_message(This, "Line %u: Unsupported usage in dcl instruction\n", This->line_no); + set_parse_status(This, PARSE_ERR); + return; + } + instr.dstmod = mod; + instr.shift = 0; + This->funcs->dstreg(This, &instr, reg); + if(!record_declaration(This->shader, usage, num, mod, FALSE, instr.dst.regnum, instr.dst.writemask, FALSE)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, DWORD mod, DWORD regnum, unsigned int line_no) { @@ -811,7 +830,7 @@ static const struct asmparser_backend parser_ps_2 = { asmparser_coissue_unsupported, asmparser_dcl_output, - asmparser_dcl_input, + asmparser_dcl_input_ps_2, asmparser_dcl_sampler, asmparser_end, @@ -831,7 +850,7 @@ static const struct asmparser_backend parser_ps_2_x = { asmparser_coissue_unsupported, asmparser_dcl_output, - asmparser_dcl_input, + asmparser_dcl_input_ps_2, asmparser_dcl_sampler, asmparser_end, diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 9bd84a3..fa6d00c 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -573,6 +573,40 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $5; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } + | INSTR_DCL omods REG_INPUT + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = BWRITERSP_WRITEMASK_ALL; + asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); + } + | INSTR_DCL omods REG_INPUT writemask + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = $4; + asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); + } | INSTR_DCL sampdcl omods REG_SAMPLER { TRACE("Sampler declared\n"); diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 5fcc248..b444365 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -343,11 +343,15 @@ static void put_dword(struct bytecode_buffer *buffer, DWORD value) { /****************************************************** * Implementation of the writer functions starts here * ******************************************************/ -static void write_declarations(struct bytecode_buffer *buffer, BOOL len, +static void write_declarations(struct bc_writer *This, + struct bytecode_buffer *buffer, BOOL len, const struct declaration *decls, unsigned int num, DWORD type) { DWORD i; DWORD instr_dcl = D3DSIO_DCL; DWORD token; + struct shader_reg reg; + + ZeroMemory(&reg, sizeof(reg)); if(len) { instr_dcl |= 2 << D3DSI_INSTLENGTH_SHIFT; @@ -366,12 +370,10 @@ static void write_declarations(struct bytecode_buffer *buffer, BOOL len, put_dword(buffer, token); /* Write the dest register */ - token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */ - token |= (type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK; - token |= (d3d9_writemask(decls[i].writemask)) & D3DSP_WRITEMASK_ALL; - token |= decls[i].regnum & D3DSP_REGNUM_MASK; - token |= d3d9_dstmod(decls[i].mod); - put_dword(buffer, token); + reg.type = type; + reg.regnum = decls[i].regnum; + reg.writemask = decls[i].writemask; + This->funcs->dstreg(This, &reg, buffer, 0, decls[i].mod); } } @@ -514,7 +516,7 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, FALSE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); + write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, FALSE); return; } @@ -908,7 +910,7 @@ static void vs_2_header(struct bc_writer *This, /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); @@ -1187,6 +1189,7 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_samplers(shader, buffer); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); @@ -1424,8 +1427,8 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); - write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); + write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 9ed1be8..5ed286e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -886,6 +886,11 @@ static void ps_2_0_test(void) { {0xffff0200, 0x0200001f, 0x90000000, 0xa00f0802, 0x03020042, 0x800f0000, 0xb0e40001, 0xa0e40802, 0x0000ffff} }, + { /* shader 11 */ + "ps_2_0\n" + "dcl v0\n", + {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1195,6 +1200,11 @@ static void ps_3_0_test(void) { "dcl_2d_pp s0\n", {0xffff0300, 0x0200001f, 0x90000000, 0xa02f0800, 0x0000ffff} }, + { /* shader 15 */ + "ps_3_0\n" + "dcl v0\n", + {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1336,6 +1346,9 @@ static void failure_test(void) { /* shader 42: no modifiers with vs dcl sampler instruction */ "vs_3_0\n" "dcl_2d_pp s0\n", + /* shader 43: can't explicitely declare input registers in ps_2_0 */ + "ps_2_0\n" + "dcl_texcoord0 t0\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Accept texture coordinate registers in dcl instruction.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 2fa119f765c005d63a5ad0d9e96d7076a24192c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa119f765c005d63a5ad0d9e… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:53:23 2010 +0200 d3dx9: Accept texture coordinate registers in dcl instruction. --- dlls/d3dx9_36/asmshader.y | 36 +++++++++++++++++++++++------------- dlls/d3dx9_36/tests/asm.c | 11 +++++++++++ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index fa6d00c..0c335b4 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -255,6 +255,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %type <modshift> omodifier %type <comptype> comp %type <declaration> dclusage +%type <reg> dcl_inputreg %type <samplertype> sampdcl %type <rel_reg> rel_reg %type <reg> predicate @@ -539,7 +540,7 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $4; asm_ctx.funcs->dcl_output(&asm_ctx, $2.dclusage, $2.regnum, &reg); } - | INSTR_DCL dclusage omods REG_INPUT + | INSTR_DCL dclusage omods dcl_inputreg { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -549,14 +550,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $4; + reg.type = $4.type; + reg.regnum = $4.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = BWRITERSP_WRITEMASK_ALL; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } - | INSTR_DCL dclusage omods REG_INPUT writemask + | INSTR_DCL dclusage omods dcl_inputreg writemask { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -566,14 +567,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $4; + reg.type = $4.type; + reg.regnum = $4.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = $5; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } - | INSTR_DCL omods REG_INPUT + | INSTR_DCL omods dcl_inputreg { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -583,14 +584,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $3; + reg.type = $3.type; + reg.regnum = $3.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = BWRITERSP_WRITEMASK_ALL; asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); } - | INSTR_DCL omods REG_INPUT writemask + | INSTR_DCL omods dcl_inputreg writemask { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -600,8 +601,8 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $3; + reg.type = $3.type; + reg.regnum = $3.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = $4; @@ -617,7 +618,7 @@ instruction: INSTR_ADD omods dreg ',' sregs } asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no); } - | INSTR_DCL sampdcl omods REG_INPUT + | INSTR_DCL sampdcl omods dcl_inputreg { TRACE("Error rule: sampler decl of input reg\n"); asmparser_message(&asm_ctx, "Line %u: Sampler declarations of input regs is not valid\n", @@ -1342,6 +1343,15 @@ dclusage: USAGE_POSITION $$.dclusage = BWRITERDECLUSAGE_SAMPLE; } +dcl_inputreg: REG_INPUT + { + $$.regnum = $1; $$.type = BWRITERSPR_INPUT; + } + | REG_TEXTURE + { + $$.regnum = $1; $$.type = BWRITERSPR_TEXTURE; + } + sampdcl: SAMPTYPE_1D { $$ = BWRITERSTT_1D; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5ed286e..dda0e2b 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -891,6 +891,17 @@ static void ps_2_0_test(void) { "dcl v0\n", {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} }, + { /* shader 12 */ + "ps_2_0\n" + "dcl t0.xyz\n" + "dcl t1\n", + {0xffff0200, 0x0200001f, 0x80000000, 0xb0070000, 0x0200001f, 0x80000000, 0xb00f0001, 0x0000ffff} + }, + { /* shader 13 */ + "ps_2_0\n" + "dcl_pp t0\n", + {0xffff0200, 0x0200001f, 0x80000000, 0xb02f0000, 0x0000ffff} + }, }; exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Damjan Jovanovic : wine.inf: Also install winhlp32 into \windows\system32.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 950919ee33898b9ed495f1d549243a3841a97623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950919ee33898b9ed495f1d54… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 8 21:42:24 2010 +0200 wine.inf: Also install winhlp32 into \windows\system32. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a8b3e6b..8a1a871 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd +11,,winhlp32.exe ; Wow64-only fake dlls [FakeDllsWow64]

1 0

Hans Leidekker : msi: Display the directory identifier instead of the full path in standard actions .
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: b8ac327e7e967deeb3179aa90c67f81edf2bbd5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ac327e7e967deeb3179aa90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 9 12:09:21 2010 +0200 msi: Display the directory identifier instead of the full path in standard actions. --- dlls/msi/action.c | 18 +++++------------- dlls/msi/files.c | 25 ++++++------------------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 565ef66..48948fb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1063,7 +1063,7 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param ) TRACE("folder is %s\n", debugstr_w(full_path)); uirow = MSI_CreateRecord( 1 ); - MSI_RecordSetStringW( uirow, 1, full_path ); + MSI_RecordSetStringW( uirow, 1, dir ); ui_actiondata( package, szRemoveFolders, uirow ); msiobj_release( &uirow->hdr ); @@ -4257,7 +4257,6 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) PROCESS_INFORMATION info; BOOL brc; MSIRECORD *uirow; - LPWSTR uipath, p; memset(&si,0,sizeof(STARTUPINFOW)); @@ -4290,14 +4289,11 @@ static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, filename ); - uipath = strdupW( file->TargetPath ); - if ((p = strrchrW( uipath,'\\' ))) *p = 0; - MSI_RecordSetStringW( uirow, 2, uipath ); + MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); ui_actiondata( package, szSelfRegModules, uirow ); msiobj_release( &uirow->hdr ); msi_free( FullName ); - msi_free( uipath ); return ERROR_SUCCESS; } @@ -4336,7 +4332,6 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) PROCESS_INFORMATION pi; BOOL ret; MSIRECORD *uirow; - LPWSTR uipath, p; memset( &si, 0, sizeof(STARTUPINFOW) ); @@ -4368,14 +4363,11 @@ static UINT ITERATE_SelfUnregModules( MSIRECORD *row, LPVOID param ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, filename ); - uipath = strdupW( file->TargetPath ); - if ((p = strrchrW( uipath,'\\' ))) *p = 0; - MSI_RecordSetStringW( uirow, 2, uipath ); + MSI_RecordSetStringW( uirow, 2, file->Component->Directory ); ui_actiondata( package, szSelfUnregModules, uirow ); msiobj_release( &uirow->hdr ); msi_free( cmdline ); - msi_free( uipath ); return ERROR_SUCCESS; } @@ -5761,7 +5753,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) uirow = MSI_CreateRecord( 5 ); MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); - MSI_RecordSetStringW( uirow, 3, driver_path ); + MSI_RecordSetStringW( uirow, 3, driver_file->Component->Directory ); ui_actiondata( package, szInstallODBC, uirow ); msiobj_release( &uirow->hdr ); @@ -5834,7 +5826,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) uirow = MSI_CreateRecord( 5 ); MSI_RecordSetStringW( uirow, 1, desc ); MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); - MSI_RecordSetStringW( uirow, 3, translator_path ); + MSI_RecordSetStringW( uirow, 3, translator_file->Component->Directory ); ui_actiondata( package, szInstallODBC, uirow ); msiobj_release( &uirow->hdr ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index fc92f14..f21cd28 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -50,21 +50,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action ) { MSIRECORD *uirow; - LPWSTR uipath, p; - /* the UI chunk */ uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, f->FileName ); - uipath = strdupW( f->TargetPath ); - p = strrchrW(uipath,'\\'); - if (p) - p[1]=0; - MSI_RecordSetStringW( uirow, 9, uipath); + MSI_RecordSetStringW( uirow, 9, f->Component->Directory ); MSI_RecordSetInteger( uirow, 6, f->FileSize ); - ui_actiondata( package, action, uirow); + ui_actiondata( package, action, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); - ui_progress( package, 2, f->FileSize, 0, 0); + ui_progress( package, 2, f->FileSize, 0, 0 ); } /* compares the version of a file read from the filesystem and @@ -987,7 +980,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { MSIRECORD *uirow; - LPWSTR dir, uipath, p; + LPWSTR dir, p; if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); @@ -1016,17 +1009,11 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) } file->state = msifs_missing; - /* the UI chunk */ uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, file->FileName ); - uipath = strdupW( file->TargetPath ); - p = strrchrW(uipath,'\\'); - if (p) - p[1]=0; - MSI_RecordSetStringW( uirow, 9, uipath); - ui_actiondata( package, szRemoveFiles, uirow); + MSI_RecordSetStringW( uirow, 9, file->Component->Directory ); + ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); - msi_free( uipath ); /* FIXME: call ui_progress here? */ }

1 0

Paul Vriens : winecfg: Update the Danish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: 17811a81c9fc40b52f4a33e15f49ad568c59b669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17811a81c9fc40b52f4a33e15… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:23:42 2010 +0200 winecfg: Update the Danish translation. --- programs/winecfg/Da.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 9e3b875..6e594cc 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -232,7 +232,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configurering for %s" IDS_THEMEFILE "Tema filer (*.msstyles; *.theme)" IDS_THEMEFILE_SELECT "Vælg en tema fil" - IDS_AUDIO_MISSING "Der er ikke nogen lyd driver valgt i registrings databasen.\n\nEn rekommenderet driver er blevet valgt for dig.\nDu kan bruge denne driver eller vælge en anden.\nDu skal klikke anvend for at valget bliver taget i brug." + IDS_AUDIO_MISSING "Der er øjeblikket ingen lyd driver angivet i registreringsdatabasen.\n\nEn anbefalet driver er blevet valgt for dig.\nDu kan bruge denne driver eller vælge en anden.\nDu skal klikke på 'Anvend' for at få dit valg til at træde i kraft." IDS_SHELL_FOLDER "Shell folder" IDS_LINKS_TO "Links to" END

1 0

Paul Vriens : regedit: Update the Danish translation.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: b0f32c551ab17297ae01053912c808815e711dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f32c551ab17297ae0105391… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:25:31 2010 +0200 regedit: Update the Danish translation. --- programs/regedit/Da.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc index 99eda33..48ff820 100644 --- a/programs/regedit/Da.rc +++ b/programs/regedit/Da.rc @@ -298,10 +298,10 @@ BEGIN IDS_TOO_BIG_VALUE "Værdien er for stor (%u)" IDS_DELETE_BOX_TITLE "Bekræft sletning af værdi" IDS_DELETE_BOX_TEXT "Er du sikker på at ville slette værdien '%s'?" - IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Er du sikker på du vil slette disse værdier?" IDS_NEWKEY "Ny nøgle #%d" IDS_NEWVALUE "Ny værdi #%d" - IDS_NOTFOUND "Fandt ikke søgestrengen «%s»" + IDS_NOTFOUND "Fandt ikke søgestrengen '%s'" END STRINGTABLE DISCARDABLE

1 0

Paul Vriens : user32: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 09 Jun '10

09 Jun '10

Module: wine Branch: master Commit: fa5fe06ca14b31cad023d3117d07c0efab42e04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5fe06ca14b31cad023d3117… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:28:30 2010 +0200 user32: Update the Danish translation and convert to UTF-8. --- dlls/user32/resources/user32_Da.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/user32/resources/user32_Da.rc b/dlls/user32/resources/user32_Da.rc index 3b5b480..3401e12 100644 --- a/dlls/user32/resources/user32_Da.rc +++ b/dlls/user32/resources/user32_Da.rc @@ -19,15 +19,17 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { - MENUITEM "&Genopret", 61728 + MENUITEM "&Gendan", 61728 MENUITEM "&Flyt", 61456 - MENUITEM "&St�rrelse", 61440 + MENUITEM "&Størrelse", 61440 MENUITEM "Mi&nimer", 61472 - MENUITEM "Ma&ximer", 61488 + MENUITEM "Ma&ksimer", 61488 MENUITEM SEPARATOR MENUITEM "&Luk\tAlt-F4", 61536 MENUITEM SEPARATOR @@ -42,7 +44,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM SEPARATOR MENUITEM "&Klip", WM_CUT MENUITEM "K&opier", WM_COPY - MENUITEM "&Inds�t", WM_PASTE + MENUITEM "&Indsæt", WM_PASTE MENUITEM "&Slet", WM_CLEAR MENUITEM SEPARATOR MENUITEM "Marker &Alt", EM_SETSEL @@ -54,21 +56,21 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Annuller", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Af&bryd", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Gentag", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignorer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nej", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Pr�v igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Forts�t", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Prøv igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Fortsæt", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Hjælp", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "V�lg vindue" +CAPTION "Vælg vindue" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */

1 0