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

Stefan Dösinger : wined3d: POW and LOG operate on the absolute value.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: f69fb5c011fcc55375c0f92616baf8ca832235c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69fb5c011fcc55375c0f9261… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 22:08:36 2009 +0200 wined3d: POW and LOG operate on the absolute value. --- dlls/wined3d/arb_program_shader.c | 81 ++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c536b38..e0bd5e7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1489,15 +1489,12 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EXPP: instruction = "EXP"; break; case WINED3DSIH_FRC: instruction = "FRC"; break; case WINED3DSIH_LIT: instruction = "LIT"; break; - case WINED3DSIH_LOG: instruction = "LG2"; break; - case WINED3DSIH_LOGP: instruction = "LOG"; break; case WINED3DSIH_LRP: instruction = "LRP"; break; case WINED3DSIH_MAD: instruction = "MAD"; break; case WINED3DSIH_MAX: instruction = "MAX"; break; case WINED3DSIH_MIN: instruction = "MIN"; break; case WINED3DSIH_MOV: instruction = "MOV"; break; case WINED3DSIH_MUL: instruction = "MUL"; break; - case WINED3DSIH_POW: instruction = "POW"; break; case WINED3DSIH_SGE: instruction = "SGE"; break; case WINED3DSIH_SLT: instruction = "SLT"; break; case WINED3DSIH_SUB: instruction = "SUB"; break; @@ -2411,6 +2408,78 @@ static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); } +static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +{ + *need_abs = FALSE; + + switch(mod) + { + case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; + case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; + case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; + case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; + case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; + case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; + case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; + case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; + case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; + case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; + case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; + case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + } + FIXME("Unknown modifier %u\n", mod); + return mod; +} + +static void shader_hw_log_pow(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src0[50], src1[50], dst[50]; + struct wined3d_shader_src_param src0_copy = ins->src[0]; + BOOL need_abs = FALSE; + const char *instr; + BOOL arg2 = FALSE; + + switch(ins->handler_idx) + { + case WINED3DSIH_LOG: instr = "LG2"; break; + case WINED3DSIH_LOGP: instr = "LOG"; break; + case WINED3DSIH_POW: instr = "POW"; arg2 = TRUE; break; + default: + ERR("Unexpected instruction %d\n", ins->handler_idx); + return; + } + + /* LOG, LOGP and POW operate on the absolute value of the input */ + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); + shader_arb_get_src_param(ins, &src0_copy, 0, src0); + if(arg2) shader_arb_get_src_param(ins, &ins->src[1], 1, src1); + + if(need_abs) + { + shader_addline(buffer, "ABS TA, %s;\n", src0); + if(arg2) + { + shader_addline(buffer, "%s%s %s, TA, %s;\n", instr, shader_arb_get_modifier(ins), dst, src1); + } + else + { + shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); + } + } + else if(arg2) + { + shader_addline(buffer, "%s%s %s, %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0, src1); + } + else + { + shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); + } +} + static void shader_hw_loop(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -4306,8 +4375,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_LABEL */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, - /* WINED3DSIH_LOG */ shader_hw_map2gl, - /* WINED3DSIH_LOGP */ shader_hw_map2gl, + /* WINED3DSIH_LOG */ shader_hw_log_pow, + /* WINED3DSIH_LOGP */ shader_hw_log_pow, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_M3x2 */ shader_hw_mnxn, @@ -4324,7 +4393,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, - /* WINED3DSIH_POW */ shader_hw_map2gl, + /* WINED3DSIH_POW */ shader_hw_log_pow, /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ NULL,

1 0

Stefan Dösinger : wined3d: Unclamp vertex colors for 3 .0 shaders in ARB if needed.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 4d86eac60ac621189fc3c1464ade49df363048c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d86eac60ac621189fc3c1464… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 22:09:36 2009 +0200 wined3d: Unclamp vertex colors for 3.0 shaders in ARB if needed. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e0bd5e7..d1ec4e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -166,6 +166,7 @@ struct arb_vs_compiled_shader GLuint prgId; UINT int_consts[MAX_CONST_I]; char num_int_consts; + char need_color_unclamp; UINT pos_fixup; }; @@ -240,6 +241,7 @@ struct shader_arb_priv BOOL use_arbfp_fixed_func; struct wine_rb_tree fragment_shaders; BOOL last_ps_const_clamped; + BOOL last_vs_color_unclamp; struct wine_rb_tree signature_tree; DWORD ps_sig_number; @@ -3334,7 +3336,8 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx) +static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx, + struct arb_vs_compiled_shader *compiled) { unsigned int i, j; static const char *texcoords[8] = @@ -3454,6 +3457,16 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu { if(semantic_idx == 0) priv_ctx->fog_output = decl_idx_to_string[reg_idx]; } + else + { + continue; + } + + if(strcmp(decl_idx_to_string[reg_idx], "result.color.primary") == 0 || + strcmp(decl_idx_to_string[reg_idx], "result.color.secondary") == 0) + { + compiled->need_color_unclamp = TRUE; + } } /* Map declared to declared */ @@ -3491,6 +3504,12 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu sig[j].semantic_idx == shader->output_signature[i].semantic_idx) { priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx]; + + if(strcmp(priv_ctx->vs_output[i], "result.color.primary") == 0 || + strcmp(priv_ctx->vs_output[i], "result.color.secondary") == 0) + { + compiled->need_color_unclamp = TRUE; + } } } } @@ -3514,7 +3533,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); - init_output_registers(This, args->ps_signature, &priv_ctx); + init_output_registers(This, args->ps_signature, &priv_ctx, compiled); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -4070,10 +4089,11 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (useVS) { struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; + IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader; TRACE("Using vertex shader %p\n", This->stateBlock->vertexShader); - find_arb_vs_compile_args((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, This->stateBlock, &compile_args); - compiled = find_arb_vshader((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, &compile_args); + find_arb_vs_compile_args(vs, This->stateBlock, &compile_args); + compiled = find_arb_vshader(vs, &compile_args); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled; @@ -4086,6 +4106,17 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); shader_arb_vs_local_constants(This); + + if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { + priv->last_vs_color_unclamp = compiled->need_color_unclamp; + + if (GL_SUPPORT(ARB_COLOR_BUFFER_FLOAT)) { + GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, !compiled->need_color_unclamp)); + checkGLcall("glClampColorARB"); + } else { + FIXME("vertex color clamp needs to be changed, but extension not supported.\n"); + } + } } else if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { priv->current_vprogram_id = 0; glDisable(GL_VERTEX_PROGRAM_ARB);

1 0

Matej Spindler : setupapi: Update Slovenian translation.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 30f3a7571af19158991b2f1f218a2df37c84e2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f3a7571af19158991b2f1f2… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 21:42:42 2009 +0200 setupapi: Update Slovenian translation. --- dlls/setupapi/Si.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Si.rc b/dlls/setupapi/Si.rc index 886644e..6dd0c58 100644 --- a/dlls/setupapi/Si.rc +++ b/dlls/setupapi/Si.rc @@ -22,6 +22,14 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Potrebujem datoteko '%s' na %s" + IDS_UNKNOWN "Neznan" + IDS_COPYFROM "Kopiraj datoteke iz:" + IDS_INFO "Napiši pot do datoteke in pritisni V redu." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Kopiranje datotek ..." @@ -35,4 +43,18 @@ BEGIN CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Vstavi proizvajalčev CD in spodaj preveri, če je\nizbran pravilen pogon", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopiraj proizvajalčeve datoteke iz:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "V redu", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Prekliči", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Brskaj...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + #pragma code_page(default)

1 0

Matej Spindler : wordpad: Update Slovenian translation.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: ab750ba2049267f82769a979b88d2290edb77d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab750ba2049267f82769a979b… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Thu Jun 25 21:49:10 2009 +0200 wordpad: Update Slovenian translation. --- programs/wordpad/Si.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 3be81b8..5e34958 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -242,7 +242,8 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "Nimate pravic za shranjevanje te datoteke." STRING_OPEN_FAILED, "Napaka pri odpiranju datoteke." STRING_OPEN_ACCESS_DENIED, "Nimate pravic za odpiranje te datoteke." - STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" + STRING_PRINTING_NOT_IMPLEMENTED, "Tiskanje (še) ni na voljo" + STRING_MAX_TAB_STOPS, "Ne morem vstaviti več kot 32 položajev tabulatorja." END #pragma code_page(default)

1 0

Paul Vriens : comctl32/tests: Fix some test failures with comctl32 < 5.80.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 2bcf38d3a33d2d8845a0e760ab3e2a5afdfa5046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcf38d3a33d2d8845a0e760a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 25 20:35:32 2009 +0200 comctl32/tests: Fix some test failures with comctl32 < 5.80. --- dlls/comctl32/tests/toolbar.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1946095..9827b14 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -415,7 +415,7 @@ static void test_add_bitmap(void) ok(strcmp(_buf, (tab)[_i]) == 0, "Invalid string #%d - '%s' vs '%s'\n", _i, (tab)[_i], _buf); \ } \ ok(SendMessageA(hToolbar, TB_GETSTRING, MAKEWPARAM(260, (count)), (LPARAM)_buf) == -1, \ - "Too many string in table\n"); \ + "Too many strings in table\n"); \ } static void test_add_string(void) @@ -432,10 +432,17 @@ static void test_add_string(void) HWND hToolbar = NULL; TBBUTTON button; int ret; + CHAR buf[260]; rebuild_toolbar(&hToolbar); ret = SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)test1); ok(ret == 0, "TB_ADDSTRINGA - unexpected return %d\n", ret); + ret = SendMessageA(hToolbar, TB_GETSTRING, MAKEWPARAM(260, 1), (LPARAM)buf); + if (ret == 0) + { + win_skip("TB_GETSTRING needs 5.80\n"); + return; + } CHECK_STRING_TABLE(2, ret1); ret = SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)test2); ok(ret == 2, "TB_ADDSTRINGA - unexpected return %d\n", ret); @@ -1281,6 +1288,12 @@ static void test_getstring(void) ok(hToolbar != NULL, "Toolbar creation problem\n"); r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), 0); + if (r == 0) + { + win_skip("TB_GETSTRING and TB_GETSTRINGW need 5.80\n"); + DestroyWindow(hToolbar); + return; + } expect(-1, r); r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), 0); expect(-1, r);

1 0

Louis Lenders : kernel32/nls: Add system message 2221 to winerr_enu.mc.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 2478b86ef66858084f7617cb272f0854e800e004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2478b86ef66858084f7617cb2… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jun 25 20:34:39 2009 +0200 kernel32/nls: Add system message 2221 to winerr_enu.mc. --- dlls/kernel32/nls/winerr_enu.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index c615e2a..8dd2088 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -3728,3 +3728,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=ENU RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=ENU +The username could not be found +.

1 0

Damjan Jovanovic : winemenubuilder: Allow multiple options.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 420d64291876130c49255d42982a1b0ae0d1d861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420d64291876130c49255d429… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 25 21:01:59 2009 +0200 winemenubuilder: Allow multiple options. --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fa74411..0549eb5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2714,12 +2714,12 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show if( !lstrcmpA( token, "-a" ) ) { RefreshFileTypeAssociations(); - break; + continue; } if( !lstrcmpA( token, "-r" ) ) { cleanup_menus(); - break; + continue; } if( !lstrcmpA( token, "-w" ) ) bWait = TRUE;

1 0

Damjan Jovanovic : wine.inf: Run winemenubuilder to delete menus on startup .
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: fe1cc3272149503323d7bcb99c5bb26cfc1fde96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1cc3272149503323d7bcb99… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 25 21:04:06 2009 +0200 wine.inf: Run winemenubuilder to delete menus on startup. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4d2999e..7e6ae73 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -403,7 +403,7 @@ HKLM,%CurrentVersion%,"RegisteredOwner",2,"" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" -HKLM,%CurrentVersion%\Run,"winemenubuilder",2,"winemenubuilder -a" +HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"winemenubuilder -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Uninstall,,,""

1 0

Aurimas Fišeras : taskmgr: Make remaining strings translatable.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: ae62524d76881a9122e06a1cb4ab0cf991f75bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae62524d76881a9122e06a1cb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jun 25 22:43:11 2009 +0300 taskmgr: Make remaining strings translatable. --- programs/taskmgr/En.rc | 14 ++++++++++++++ programs/taskmgr/Lt.rc | 14 ++++++++++++++ programs/taskmgr/applpage.c | 16 +++++++++------- programs/taskmgr/dbgchnl.c | 16 +++++++++++----- programs/taskmgr/perfdata.c | 3 ++- programs/taskmgr/procpage.c | 3 +-- programs/taskmgr/resource.h | 10 ++++++++++ programs/taskmgr/trayicon.c | 8 ++++++-- 8 files changed, 67 insertions(+), 17 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 425f44e..ce2bdf5 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -556,3 +556,17 @@ BEGIN IDS_AFFINITY_ERROR_TITLE "Invalid Option" IDS_AFFINITY_UNABLE2ACCESS "Unable to Access or Set Process Affinity" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "System Idle Process" + IDS_APPLICATION_NOT_RESPONDING "Not Responding" + IDS_APPLICATION_RUNNING "Running" + IDS_APPLICATION_TASK "Task" + IDS_APPLICATION_STATUS "Status" + IDS_DEBUG_CHANNEL "Debug Channels" + IDS_DEBUG_CHANNEL_FIXME "Fixme" + IDS_DEBUG_CHANNEL_ERR "Err" + IDS_DEBUG_CHANNEL_WARN "Warn" + IDS_DEBUG_CHANNEL_TRACE "Trace" +END diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 8d9603f..c58647a 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -547,4 +547,18 @@ BEGIN IDS_AFFINITY_UNABLE2ACCESS "Nepavyko prieiti prie ar nustatyti proceso atitikimo" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "Sistemos neveikos procesas" + IDS_APPLICATION_NOT_RESPONDING "Neatsako" + IDS_APPLICATION_RUNNING "Vykdoma" + IDS_APPLICATION_TASK "Užduotis" + IDS_APPLICATION_STATUS "Būsena" + IDS_DEBUG_CHANNEL "Derinimo kanalai" + IDS_DEBUG_CHANNEL_FIXME "Fixme (pataisyk)" + IDS_DEBUG_CHANNEL_ERR "Err (klaida)" + IDS_DEBUG_CHANNEL_WARN "Warn (įspėjimas)" + IDS_DEBUG_CHANNEL_TRACE "Trace (pėdsakas)" +END + #pragma code_page(default) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 8fb923d..b958887 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -417,9 +417,11 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) LV_DISPINFOW* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI; - static const WCHAR wszNotResponding[] = {'N','o','t',' ','R','e','s','p','o','n','d','i','n','g',0}; - static const WCHAR wszRunning[] = {'R','u','n','n','i','n','g',0}; + WCHAR wszNotResponding[255]; + WCHAR wszRunning[255]; + LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR)); idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; @@ -837,9 +839,11 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int cx, cy; LVCOLUMNW column; - static const WCHAR wszTasks[] = {'T','a','s','k','s',0}; - static WCHAR wszTask[] = {'T','a','s','k',0}; - static WCHAR wszStatus[] = {'S','t','a','t','u','s',0}; + WCHAR wszTask[255]; + WCHAR wszStatus[255]; + + LoadStringW(hInst, IDS_APPLICATION_TASK, wszTask, sizeof(wszTask)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_APPLICATION_STATUS, wszStatus, sizeof(wszStatus)/sizeof(WCHAR)); switch (message) { case WM_INITDIALOG: @@ -858,8 +862,6 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hApplicationPageSwitchToButton = GetDlgItem(hDlg, IDC_SWITCHTO); hApplicationPageNewTaskButton = GetDlgItem(hDlg, IDC_NEWTASK); - SetWindowTextW(hApplicationPageListCtrl, wszTasks); - /* Initialize the application page's controls */ column.mask = LVCF_TEXT|LVCF_WIDTH; column.pszText = wszTask; diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 382675f..77ddb6c 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -224,11 +224,17 @@ static void DebugChannels_OnCreate(HWND hwndDlg) HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST); LVCOLUMNW lvc; - static WCHAR debug_channelW[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, - fixmeW[] = {'F','i','x','m','e',0}, - errW[] = {'E','r','r',0}, - warnW[] = {'W','a','r','n',0}, - traceW[] = {'T','r','a','c','e',0}; + WCHAR debug_channelW[255]; + WCHAR fixmeW[255]; + WCHAR errW[255]; + WCHAR warnW[255]; + WCHAR traceW[255]; + + LoadStringW(hInst, IDS_DEBUG_CHANNEL, debug_channelW, sizeof(debug_channelW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_FIXME, fixmeW, sizeof(fixmeW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_ERR, errW, sizeof(errW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_WARN, warnW, sizeof(warnW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DEBUG_CHANNEL_TRACE, traceW, sizeof(traceW)/sizeof(WCHAR)); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 5a24ba3..c96fdcf 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -253,7 +253,8 @@ void PerfDataRefresh(void) lstrcpyW(pPerfData[Idx].ImageName, pSPI->Name.Buffer); else { - static const WCHAR idleW[] = {'S','y','s','t','e','m',' ','I','d','l','e',' ','P','r','o','c','e','s','s',0}; + WCHAR idleW[255]; + LoadStringW(hInst, IDS_SYSTEM_IDLE_PROCESS, idleW, sizeof(idleW)/sizeof(WCHAR)); lstrcpyW(pPerfData[Idx].ImageName, idleW ); } diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 4cc02f1..c16f3b0 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -466,9 +466,8 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); /* - * Set the title and extended window styles for the list control + * Set the extended window styles for the list control */ - SetWindowText(hProcessPageListCtrl, _T("Processes")); SendMessage(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); AddColumns(); diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 236f848..1b98ab0 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -233,6 +233,16 @@ #define IDS_AFFINITY_ERROR_MESSAGE 32864 #define IDS_AFFINITY_ERROR_TITLE 32865 #define IDS_AFFINITY_UNABLE2ACCESS 32866 +#define IDS_SYSTEM_IDLE_PROCESS 32867 +#define IDS_APPLICATION_NOT_RESPONDING 32868 +#define IDS_APPLICATION_RUNNING 32869 +#define IDS_APPLICATION_TASK 32870 +#define IDS_APPLICATION_STATUS 32871 +#define IDS_DEBUG_CHANNEL 32872 +#define IDS_DEBUG_CHANNEL_FIXME 32873 +#define IDS_DEBUG_CHANNEL_ERR 32874 +#define IDS_DEBUG_CHANNEL_WARN 32875 +#define IDS_DEBUG_CHANNEL_TRACE 32876 #define IDC_STATIC -1 /* diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 35740dd..b1379f5 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -142,7 +142,9 @@ BOOL TrayIcon_ShellAddTrayIcon(void) NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; + WCHAR wszCPU_Usage[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -187,7 +189,9 @@ BOOL TrayIcon_ShellUpdateTrayIcon(void) NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','d','%','%',0}; + WCHAR wszCPU_Usage[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); memset(&nid, 0, sizeof(NOTIFYICONDATAW));

1 0

Eric Pouech : dbghelp: When loading ELF public information, handle the cases when we don't get an address.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 607a07f42affeb52ec9c1b654233366d1fc3d295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607a07f42affeb52ec9c1b654… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Jun 25 22:27:24 2009 +0200 dbghelp: When loading ELF public information, handle the cases when we don't get an address. --- dlls/dbghelp/elf_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b672788..12754dd 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -650,8 +650,8 @@ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symt ULONG64 ref_addr; symt = symt_find_nearest(module, addr); - if (symt) - symt_get_info(&symt->symt, TI_GET_ADDRESS, &ref_addr); + if (symt && !symt_get_info(&symt->symt, TI_GET_ADDRESS, &ref_addr)) + ref_addr = addr; if (!symt || addr != ref_addr) { /* creating public symbols for all the ELF symbols which haven't been

1 0