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

Matteo Bruni : d3dx9: Support some flow control instructions in the shader assembler.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 25c929ab6191eb1ccb158f676e5cbcbcf29d6f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c929ab6191eb1ccb158f676… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue May 11 20:29:07 2010 +0200 d3dx9: Support some flow control instructions in the shader assembler. --- dlls/d3dx9_36/asmshader.l | 14 +++++++ dlls/d3dx9_36/asmshader.y | 81 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 30 ++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 13 ++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++++ 5 files changed, 151 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25c929ab6191eb1ccb158…

1 0

Matteo Bruni : d3dx9: Add other flow control instructions in the shader assembler.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 93b2648c49497ef1fd55fb09b67227e8e3ad319f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b2648c49497ef1fd55fb09b… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Nov 24 02:08:32 2009 +0100 d3dx9: Add other flow control instructions in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 5 +++-- dlls/d3dx9_36/asmshader.l | 8 ++++++++ dlls/d3dx9_36/asmshader.y | 27 +++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 31 +++++++++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 4 ++++ dlls/d3dx9_36/d3dx9_36_private.h | 12 +++++++++++- 6 files changed, 84 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93b2648c49497ef1fd55f…

1 0

Matteo Bruni : d3dx9: Add predicate support to the shader assembler.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 9847d28753fb13e75e55e5cc7b4f5d1648d4717b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9847d28753fb13e75e55e5cc7… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue May 11 20:29:07 2010 +0200 d3dx9: Add predicate support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 13 ++++++++++++- dlls/d3dx9_36/asmshader.l | 2 ++ dlls/d3dx9_36/asmshader.y | 35 +++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 4 ++++ dlls/d3dx9_36/bytecodewriter.c | 4 ++++ dlls/d3dx9_36/d3dx9_36_private.h | 2 ++ 6 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 15ac7ea..e08c421 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -106,11 +106,22 @@ static void asmparser_dstreg_vs_3(struct asm_parser *This, instr->has_dst = TRUE; } +static void asmparser_predicate_supported(struct asm_parser *This, + const struct shader_reg *predicate) { + /* this sets the predicate of the last instruction added to the shader */ + if(!This->shader) return; + if(This->shader->num_instrs == 0) ERR("Predicate without an instruction\n"); + This->shader->instr[This->shader->num_instrs - 1]->has_predicate = TRUE; + memcpy(&This->shader->instr[This->shader->num_instrs - 1]->predicate, predicate, sizeof(*predicate)); +} + +#if 0 static void asmparser_predicate_unsupported(struct asm_parser *This, const struct shader_reg *predicate) { asmparser_message(This, "Line %u: Predicate not supported in < VS 2.0 or PS 2.x\n", This->line_no); set_parse_status(This, PARSE_ERR); } +#endif static void asmparser_coissue_unsupported(struct asm_parser *This) { asmparser_message(This, "Line %u: Coissue is only supported in pixel shaders versions <= 1.4\n", This->line_no); @@ -121,7 +132,7 @@ static const struct asmparser_backend parser_vs_3 = { asmparser_dstreg_vs_3, asmparser_srcreg_vs_3, - asmparser_predicate_unsupported, + asmparser_predicate_supported, asmparser_coissue_unsupported, asmparser_end, diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index a62f668..0fe0932 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -123,12 +123,14 @@ if {return INSTR_IF; } else {return INSTR_ELSE; } endif {return INSTR_ENDIF; } break {return INSTR_BREAK; } +breakp {return INSTR_BREAKP; } call {return INSTR_CALL; } callnz {return INSTR_CALLNZ; } loop {return INSTR_LOOP; } ret {return INSTR_RET; } endloop {return INSTR_ENDLOOP; } label {return INSTR_LABEL; } +setp {return INSTR_SETP; } texldl {return INSTR_TEXLDL; } /* Vertex shader only instructions */ diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index ed4dd71..0c114e5 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -123,12 +123,14 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token INSTR_ELSE %token INSTR_ENDIF %token INSTR_BREAK +%token INSTR_BREAKP %token INSTR_CALL %token INSTR_CALLNZ %token INSTR_LOOP %token INSTR_RET %token INSTR_ENDLOOP %token INSTR_LABEL +%token INSTR_SETP %token INSTR_TEXLDL /* Vertex shader only instructions */ @@ -209,6 +211,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %type <modshift> omodifier %type <comptype> comp %type <rel_reg> rel_reg +%type <reg> predicate %type <immval> immsum %type <sregs> sregs @@ -307,6 +310,11 @@ complexinstr: instruction { } + | predicate instruction + { + TRACE("predicate\n"); + asm_ctx.funcs->predicate(&asm_ctx, &$1); + } instruction: INSTR_ADD omods dreg ',' sregs { @@ -508,6 +516,11 @@ instruction: INSTR_ADD omods dreg ',' sregs TRACE("BREAKC\n"); asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_BREAKC, 0, 0, $2, 0, &$3, 2); } + | INSTR_BREAKP sregs + { + TRACE("BREAKP\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_BREAKP, 0, 0, 0, 0, &$2, 1); + } | INSTR_CALL sregs { TRACE("CALL\n"); @@ -538,6 +551,11 @@ instruction: INSTR_ADD omods dreg ',' sregs TRACE("LABEL\n"); asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_LABEL, 0, 0, 0, 0, &$2, 1); } + | INSTR_SETP comp dreg ',' sregs + { + TRACE("SETP\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_SETP, 0, 0, $2, &$3, &$5, 2); + } | INSTR_TEXLDL omods dreg ',' sregs { TRACE("TEXLDL\n"); @@ -1023,6 +1041,23 @@ comp: COMP_GT { $$ = BWRITER_COMPARISON_GT; } | COMP_EQ { $$ = BWRITER_COMPARISON_EQ; } | COMP_NE { $$ = BWRITER_COMPARISON_NE; } +predicate: '(' REG_PREDICATE swizzle ')' + { + $$.type = BWRITERSPR_PREDICATE; + $$.regnum = 0; + $$.rel_reg = NULL; + $$.srcmod = BWRITERSPSM_NONE; + $$.swizzle = $3; + } + | '(' SMOD_NOT REG_PREDICATE swizzle ')' + { + $$.type = BWRITERSPR_PREDICATE; + $$.regnum = 0; + $$.rel_reg = NULL; + $$.srcmod = BWRITERSPSM_NOT; + $$.swizzle = $4; + } + %% void asmshader_error (char const *s) { diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index 229fa5e..9adb108 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -179,7 +179,9 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_MOVA: return D3DSIO_MOVA; case BWRITERSIO_EXPP: return D3DSIO_EXPP; case BWRITERSIO_LOGP: return D3DSIO_LOGP; + case BWRITERSIO_SETP: return D3DSIO_SETP; case BWRITERSIO_TEXLDL: return D3DSIO_TEXLDL; + case BWRITERSIO_BREAKP: return D3DSIO_BREAKP; case BWRITERSIO_COMMENT: return D3DSIO_COMMENT; case BWRITERSIO_END: return D3DSIO_END; @@ -441,7 +443,9 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_MOVA: return "mova"; case BWRITERSIO_EXPP: return "expp"; case BWRITERSIO_LOGP: return "logp"; + case BWRITERSIO_SETP: return "setp"; case BWRITERSIO_TEXLDL: return "texldl"; + case BWRITERSIO_BREAKP: return "breakp"; default: return "unknown"; } diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 17bc3d5..64a7035 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -198,6 +198,8 @@ static void sm_2_opcode(struct bc_writer *This, token |= instrlen(instr, instr->num_srcs, dsts) << D3DSI_INSTLENGTH_SHIFT; if(instr->comptype) token |= (d3d9_comparetype(instr->comptype) << 16) & (0xf << 16); + if(instr->has_predicate) + token |= D3DSHADER_INSTRUCTION_PREDICATED; put_dword(buffer,token); } @@ -335,6 +337,8 @@ static const struct instr_handler_table vs_3_handlers[] = { {BWRITERSIO_RET, instr_handler}, {BWRITERSIO_ENDLOOP, instr_handler}, + {BWRITERSIO_SETP, instr_handler}, + {BWRITERSIO_BREAKP, instr_handler}, {BWRITERSIO_TEXLDL, instr_handler}, {BWRITERSIO_END, NULL}, diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index b83ee49..6222d66 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -420,7 +420,9 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_EXPP, BWRITERSIO_LOGP, + BWRITERSIO_SETP, BWRITERSIO_TEXLDL, + BWRITERSIO_BREAKP, BWRITERSIO_COMMENT, BWRITERSIO_END,

1 0

Marcus Meissner : ntdll: Rename mergesort to NTDLL_mergesort.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 364242fcf301ecb255cb0f8abe4d0d468d50c2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=364242fcf301ecb255cb0f8ab… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 12 07:53:39 2010 +0200 ntdll: Rename mergesort to NTDLL_mergesort. --- dlls/ntdll/misc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index d09ceef..01e9ab6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -254,14 +254,15 @@ double CDECL NTDLL_tan( double d ) /* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */ -static void mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), - int left, int right ) +static void +NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), + int left, int right ) { if(right>left) { int i, j, k, m; m=(right+left)/2; - mergesort( arr, barr, elemsize, compar, left, m); - mergesort( arr, barr, elemsize, compar, m+1, right); + NTDLL_mergesort( arr, barr, elemsize, compar, left, m); + NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right); #define X(a,i) ((char*)a+elemsize*(i)) for (i=m+1; i>left; i--) @@ -290,6 +291,6 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, int(__cdecl *compar)(const void *, const void *) ) { void *secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); - mergesort( base, secondarr, size, compar, 0, nmemb-1 ); + NTDLL_mergesort( base, secondarr, size, compar, 0, nmemb-1 ); RtlFreeHeap (GetProcessHeap(),0, secondarr); }

1 0

Alexandre Julliard : winex11: Update the cursor also for events ignored by a hook.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 5ee89aad682ed52ce5c505f03580f19ccf65d804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee89aad682ed52ce5c505f03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 12 13:48:00 2010 +0200 winex11: Update the cursor also for events ignored by a hook. --- dlls/winex11.drv/mouse.c | 3 ++- server/queue.c | 11 ++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5a1a09f..b044182 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -304,7 +304,8 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, hook.dwExtraInfo = extra_info; last_time_modified = GetTickCount(); - if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; + if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) + message = 0; /* ignore it */ SERVER_START_REQ( send_hardware_message ) { diff --git a/server/queue.c b/server/queue.c index d2090cd..755d3c1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1717,9 +1717,11 @@ DECL_HANDLER(send_hardware_message) return; } input = thread->queue->input; + reply->cursor = input->cursor; + reply->count = input->cursor_count; } - if (!(data = mem_alloc( sizeof(*data) ))) + if (!req->msg || !(data = mem_alloc( sizeof(*data) ))) { if (thread) release_object( thread ); return; @@ -1744,12 +1746,7 @@ DECL_HANDLER(send_hardware_message) } else free( data ); - if (thread) - { - reply->cursor = input->cursor; - reply->count = input->cursor_count; - release_object( thread ); - } + if (thread) release_object( thread ); } /* post a quit message to the current queue */

1 0

Michael Stefaniuc : jscript: Avoid using long.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: cd6ba3519ad7174433d51f88f2f16b1914da0e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6ba3519ad7174433d51f88f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 12 11:31:17 2010 +0200 jscript: Avoid using long. --- dlls/jscript/regexp.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 7861d22..ff7ef29 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -1977,7 +1977,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, ptrdiff_t btincr = ((char *)result + sz) - ((char *)gData->backTrackStack + btsize); - TRACE("\tBT_Push: %lu,%lu\n", (unsigned long) parenIndex, (unsigned long) parenCount); + TRACE("\tBT_Push: %lu,%lu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount); JS_COUNT_OPERATION(gData->cx, JSOW_JUMP * (1 + parenCount)); if (btincr > 0) { @@ -2729,7 +2729,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) case REOP_LPAREN: pc = ReadCompactIndex(pc, &parenIndex); - TRACE("[ %lu ]\n", (unsigned long) parenIndex); + TRACE("[ %lu ]\n", (ULONG_PTR)parenIndex); assert(parenIndex < gData->regexp->parenCount); if (parenIndex + 1 > parenSoFar) parenSoFar = parenIndex + 1; @@ -3093,8 +3093,8 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x) } TRACE("\tBT_Pop: %ld,%ld\n", - (unsigned long) backTrackData->parenIndex, - (unsigned long) backTrackData->parenCount); + (ULONG_PTR)backTrackData->parenIndex, + (ULONG_PTR)backTrackData->parenCount); continue; } x = result;

1 0

Hans Leidekker : msi: Store the disk id in the MSIFILE structure.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 376c2fd02b5709a7c3cff88b2bbf08ebcd34cb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376c2fd02b5709a7c3cff88b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 12 14:18:15 2010 +0200 msi: Store the disk id in the MSIFILE structure. --- dlls/msi/action.c | 21 +++++++++++++++++++++ dlls/msi/msipriv.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fb46167..c5354de 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1374,6 +1374,26 @@ done: return r; } +static UINT load_file_disk_id( MSIPACKAGE *package, MSIFILE *file ) +{ + MSIRECORD *row; + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','`','D','i','s','k','I','d','`',' ', 'F','R','O','M',' ', + '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', + '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','i',0}; + + row = MSI_QueryGetRecord( package->db, query, file->Sequence ); + if (!row) + { + WARN("query failed\n"); + return ERROR_FUNCTION_FAILED; + } + + file->disk_id = MSI_RecordGetInteger( row, 1 ); + msiobj_release( &row->hdr ); + return ERROR_SUCCESS; +} + static UINT load_file(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = param; @@ -1435,6 +1455,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) } load_file_hash(package, file); + load_file_disk_id(package, file); TRACE("File Loaded (%s)\n",debugstr_w(file->File)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3848745..cf9e690 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -468,6 +468,7 @@ typedef struct tagMSIFILE LPWSTR TargetPath; BOOL IsCompressed; MSIFILEHASHINFO hash; + UINT disk_id; } MSIFILE; typedef struct tagMSITEMPFILE

1 0

Hans Leidekker : msi: Only extract a file when its disk id matches the media disk id.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: 6475c11c1f5ef0eaee9f9476ed3ff7686d58056d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6475c11c1f5ef0eaee9f9476e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 12 14:18:41 2010 +0200 msi: Only extract a file when its disk id matches the media disk id. This makes sure that an updated file is extracted from the cabinet stream included in the patch, instead of the original source. --- dlls/msi/files.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 10dbb28..bea1837 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -179,6 +179,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { static MSIFILE *f = NULL; + MSIMEDIAINFO *mi = user; if (action == MSICABEXTRACT_BEGINEXTRACT) { @@ -189,11 +190,8 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return FALSE; } - if (f->state != msifs_missing && f->state != msifs_overwrite) - { - TRACE("Skipping extraction of %s\n", debugstr_w(file)); + if (f->disk_id != mi->disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) return FALSE; - } msi_file_update_ui(package, f, szInstallFiles); @@ -257,7 +255,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) data.mi = mi; data.package = package; data.cb = installfiles_cb; - data.user = NULL; + data.user = mi; if (file->IsCompressed && !msi_cabextract(package, mi, &data))

1 0

Hans Leidekker : msi: Improve some traces.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: e60bf536eba17726465b10e33590362c5d5723e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60bf536eba17726465b10e33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 12 14:19:04 2010 +0200 msi: Improve some traces. --- dlls/msi/files.c | 8 +++----- dlls/msi/media.c | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index bea1837..f66d815 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -121,8 +121,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) { UINT gle; - TRACE("Copying %s to %s\n", debugstr_w(source), - debugstr_w(file->TargetPath)); + TRACE("Copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); gle = copy_file(file, source); if (gle == ERROR_SUCCESS) @@ -248,7 +247,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ready_media(package, file, mi); if (rc != ERROR_SUCCESS) { - ERR("Failed to ready media\n"); + ERR("Failed to ready media for %s\n", debugstr_w(file->File)); break; } @@ -288,8 +287,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } else if (file->state != msifs_installed) { - ERR("compressed file wasn't extracted (%s)\n", - debugstr_w(file->TargetPath)); + ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->TargetPath)); rc = ERROR_INSTALL_FAILURE; break; } diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7cf9836..7cac9e7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -471,8 +471,6 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - TRACE("(%d)\n", fdint); - switch (fdint) { case fdintPARTIAL_FILE: @@ -494,8 +492,6 @@ static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION static INT_PTR CDECL cabinet_notify_stream( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin ) { - TRACE("(%d)\n", fdint); - switch (fdint) { case fdintCOPY_FILE: @@ -774,7 +770,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) rc = msi_load_media_info(package, file, mi); if (rc != ERROR_SUCCESS) { - ERR("Unable to load media info\n"); + ERR("Unable to load media info %u\n", rc); return ERROR_FUNCTION_FAILED; }

1 0

André Hentschel : wordpad: Update German translation.
by Alexandre Julliard 12 May '10

12 May '10

Module: wine Branch: master Commit: af84fc4d1b0467cc93ea9c04796d56b6c62cec19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af84fc4d1b0467cc93ea9c047… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 11 21:22:33 2010 +0200 wordpad: Update German translation. --- programs/wordpad/De.rc | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index ca11edd..f6079c5 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -192,7 +192,7 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Zeilenumbruch", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "&Kein Zeilenumbruch", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Symbolleisten", -1, 150, 10, 120, 85 @@ -249,11 +249,10 @@ BEGIN STRING_PREVIEW_CLOSE, "&Schließen" STRING_PREVIEW_PAGE, "Seite" STRING_PREVIEW_PAGES, "Seiten" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "Zoll" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0