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

Andrew Eikum : gdiplus/tests: Add tests for GdipDrawCurve2I.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: c2aa66d506c6b0ffb498102c0b02fe2f17d3dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aa66d506c6b0ffb498102c0… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jun 28 13:33:59 2009 -0500 gdiplus/tests: Add tests for GdipDrawCurve2I. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 68 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d7f096..c052bc3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1514,7 +1514,7 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); - if(!points || count <= 0) + if(!points) return InvalidParameter; pointsF = GdipAlloc(sizeof(GpPointF)*count); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f83d012..e42044a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -428,6 +428,73 @@ static void test_GdipDrawCurve2(void) ReleaseDC(0, hdc); } +static void test_GdipDrawCurve2I(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurve2I(NULL, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(graphics, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(NULL, pen, points, 3, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurve2I(graphics, pen, points, -1, 1); + expect(OutOfMemory, status); + + status = GdipDrawCurve2I(graphics, pen, points, 0, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(graphics, pen, points, 1, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurve2I(graphics, pen, points, 2, 1); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, 2); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, -2); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, 0); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + static void test_GdipDrawCurve(void) { GpStatus status; @@ -1277,6 +1344,7 @@ START_TEST(graphics) test_GdipDrawCurve(); test_GdipDrawCurveI(); test_GdipDrawCurve2(); + test_GdipDrawCurve2I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString();

1 0

Stefan Dösinger : wined3d: ARB*p is already on after a depth blit.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 031401a07053d9b6e53d4fef068bcabda07778f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031401a07053d9b6e53d4fef0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 27 13:15:32 2009 +0200 wined3d: ARB*p is already on after a depth blit. --- dlls/wined3d/arb_program_shader.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 026fac1..06bcc62 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4163,9 +4163,6 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, vertexShader->prgId);"); - glEnable(GL_VERTEX_PROGRAM_ARB); - checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); - TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); } else { glDisable(GL_VERTEX_PROGRAM_ARB); @@ -4176,9 +4173,6 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); } else if(!priv->use_arbfp_fixed_func) { glDisable(GL_FRAGMENT_PROGRAM_ARB);

1 0

Stefan Dösinger : wined3d: Implement function calls with NV exts.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 5859d877544747fdedd18c32918696fa3442131d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5859d877544747fdedd18c329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 18:54:28 2009 +0200 wined3d: Implement function calls with NV exts. --- dlls/wined3d/arb_program_shader.c | 37 +++++++++++++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 06bcc62..729ff44 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2797,6 +2797,35 @@ static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, sampler_idx, reg_dest, reg_coord, flags, NULL, NULL); } +static void shader_hw_label(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + + /* Call instructions activate the NV extensions, not labels and rets. If there is an uncalled + * subroutine, don't generate a label that will make GL complain + */ + if(priv->target_version == ARB) return; + + shader_addline(buffer, "l%u:\n", ins->src[0].reg.idx); +} + +static void shader_hw_ret(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + + if(priv->target_version == ARB) return; + + shader_addline(buffer, "RET;\n"); +} + +static void shader_hw_call(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + shader_addline(buffer, "CAL l%u;\n", ins->src[0].reg.idx); +} + /* GL locking is done by the caller */ static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { @@ -3079,7 +3108,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * So enable the best we can get. */ if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd || - reg_maps->usestexldl || reg_maps->usesfacing || reg_maps->usesifc) + reg_maps->usestexldl || reg_maps->usesfacing || reg_maps->usesifc || reg_maps->usescall) { want_nv_prog = TRUE; } @@ -4388,7 +4417,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, - /* WINED3DSIH_CALL */ NULL, + /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, @@ -4412,7 +4441,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, - /* WINED3DSIH_LABEL */ NULL, + /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_log_pow, /* WINED3DSIH_LOGP */ shader_hw_log_pow, @@ -4435,7 +4464,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_POW */ shader_hw_log_pow, /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ shader_hw_rep, - /* WINED3DSIH_RET */ NULL, + /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d23d037..c5aafbf 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -709,6 +709,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usesifc = 1; } + else if(ins.handler_idx == WINED3DSIH_CALL) + { + reg_maps->usescall = 1; + } limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) @@ -1089,8 +1093,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, || ins.handler_idx == WINED3DSIH_DEF || ins.handler_idx == WINED3DSIH_DEFI || ins.handler_idx == WINED3DSIH_DEFB - || ins.handler_idx == WINED3DSIH_PHASE - || ins.handler_idx == WINED3DSIH_RET) + || ins.handler_idx == WINED3DSIH_PHASE) { pToken += param_size; continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9b64bf..ffee326 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -641,7 +641,8 @@ typedef struct shader_reg_maps unsigned fog : 1; unsigned usestexldl : 1; unsigned usesifc : 1; - unsigned padding : 5; + unsigned usescall : 1; + unsigned padding : 4; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Stefan Dösinger : wined3d: Write the vshader footer in a separate function.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 5befed21f62a3d5e7d123ff3b8d4f533faa38c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5befed21f62a3d5e7d123ff3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:43:11 2009 +0200 wined3d: Write the vshader footer in a separate function. --- dlls/wined3d/arb_program_shader.c | 162 ++++++++++++++++++++----------------- 1 files changed, 87 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 729ff44..a9862ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -200,6 +200,8 @@ struct shader_arb_ctx_priv unsigned int num_loops, loop_depth, num_ifcs; int aL; + unsigned int vs_clipplanes; + /* For 3.0 vertex shaders */ const char *vs_output[MAX_REG_OUTPUT]; /* For 2.x and earlier vertex shaders */ @@ -3563,6 +3565,89 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } } +static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, + struct shader_arb_ctx_priv *priv_ctx) +{ + const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + unsigned int i; + + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->super.fog_src == VS_FOG_Z) { + shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. + */ + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + + if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) + { + for(i = 0; i < priv_ctx->vs_clipplanes; i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } + } + else if(args->boolclip.clip_control[0]) + { + unsigned int cur_clip = 0; + char component[4] = {'x', 'y', 'z', 'w'}; + + for(i = 0; i < GL_LIMITS(clipplanes); i++) + { + if(args->boolclip.clip_control[1] & (1 << i)) + { + shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", + component[cur_clip++], i); + } + } + switch(cur_clip) + { + case 0: + shader_addline(buffer, "MOV TA, -helper_const.w;\n"); + break; + case 1: + shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); + break; + case 2: + shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); + break; + case 3: + shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); + break; + } + shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", + args->boolclip.clip_control[0] - 1); + } + + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c + * and the glsl equivalent + */ + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } + + shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); +} + /* GL locking is done by the caller */ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) @@ -3576,7 +3661,6 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; unsigned int i; - DWORD num_clipplanes = 0; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -3614,7 +3698,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Base Declarations */ next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, &num_clipplanes, &priv_ctx); + lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -3669,79 +3753,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); - /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used - * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), - * the fog frag coord is thrown away. If the fog frag coord is used, but not written by - * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) - */ - if(args->super.fog_src == VS_FOG_Z) { - shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - } else if (!reg_maps->fog) { - /* posFixup.x is always 1.0, so we can savely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); - } - - /* Write the final position. - * - * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains - * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x - * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. - */ - shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - - if(use_nv_clip(gl_info) && priv_ctx.target_version >= NV2) - { - for(i = 0; i < num_clipplanes; i++) - { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); - } - } - else if(args->boolclip.clip_control[0]) - { - unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; - - for(i = 0; i < GL_LIMITS(clipplanes); i++) - { - if(args->boolclip.clip_control[1] & (1 << i)) - { - shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", - component[cur_clip++], i); - } - } - switch(cur_clip) - { - case 0: - shader_addline(buffer, "MOV TA, -helper_const.w;\n"); - break; - case 1: - shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); - break; - case 2: - shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); - break; - case 3: - shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); - break; - } - shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", - args->boolclip.clip_control[0] - 1); - } - - /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c - * and the glsl equivalent - */ - if(need_helper_const(gl_info)) { - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); - } else { - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); - } - - shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); + vshader_add_footer(This, buffer, args, &priv_ctx); shader_addline(buffer, "END\n");

1 0

Stefan Dösinger : wined3d: Add the vertex shader footer in the main function.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: d4312ebb16578d7d8ae193edd3d293d3748c7df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4312ebb16578d7d8ae193edd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:52:17 2009 +0200 wined3d: Add the vertex shader footer in the main function. --- dlls/wined3d/arb_program_shader.c | 182 ++++++++++++++++++++----------------- 1 files changed, 98 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a9862ad..e438366 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -201,6 +201,8 @@ struct shader_arb_ctx_priv int aL; unsigned int vs_clipplanes; + BOOL footer_written; + BOOL in_main_func; /* For 3.0 vertex shaders */ const char *vs_output[MAX_REG_OUTPUT]; @@ -2804,6 +2806,7 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + priv->in_main_func = FALSE; /* Call instructions activate the NV extensions, not labels and rets. If there is an uncalled * subroutine, don't generate a label that will make GL complain */ @@ -2812,13 +2815,105 @@ static void shader_hw_label(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "l%u:\n", ins->src[0].reg.idx); } +static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, + struct shader_arb_ctx_priv *priv_ctx) +{ + const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + unsigned int i; + + /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used + * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), + * the fog frag coord is thrown away. If the fog frag coord is used, but not written by + * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) + */ + if(args->super.fog_src == VS_FOG_Z) { + shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); + } else if (!reg_maps->fog) { + /* posFixup.x is always 1.0, so we can savely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. + */ + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + + if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) + { + for(i = 0; i < priv_ctx->vs_clipplanes; i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } + } + else if(args->boolclip.clip_control[0]) + { + unsigned int cur_clip = 0; + char component[4] = {'x', 'y', 'z', 'w'}; + + for(i = 0; i < GL_LIMITS(clipplanes); i++) + { + if(args->boolclip.clip_control[1] & (1 << i)) + { + shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", + component[cur_clip++], i); + } + } + switch(cur_clip) + { + case 0: + shader_addline(buffer, "MOV TA, -helper_const.w;\n"); + break; + case 1: + shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); + break; + case 2: + shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); + break; + case 3: + shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); + break; + } + shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", + args->boolclip.clip_control[0] - 1); + } + + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c + * and the glsl equivalent + */ + if(need_helper_const(gl_info)) { + shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); + } else { + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); + shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); + } + + shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); + + priv_ctx->footer_written = TRUE; +} + static void shader_hw_ret(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *) ins->ctx->shader; + BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); if(priv->target_version == ARB) return; + if(vshader) + { + if(priv->in_main_func) vshader_add_footer((IWineD3DVertexShaderImpl *) shader, buffer, priv->cur_vs_args, priv); + } + shader_addline(buffer, "RET;\n"); } @@ -3565,89 +3660,6 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } } -static void vshader_add_footer(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, - struct shader_arb_ctx_priv *priv_ctx) -{ - const shader_reg_maps *reg_maps = &This->baseShader.reg_maps; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; - unsigned int i; - - /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used - * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), - * the fog frag coord is thrown away. If the fog frag coord is used, but not written by - * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) - */ - if(args->super.fog_src == VS_FOG_Z) { - shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - } else if (!reg_maps->fog) { - /* posFixup.x is always 1.0, so we can savely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); - } - - /* Write the final position. - * - * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains - * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x - * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. - */ - shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - - if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) - { - for(i = 0; i < priv_ctx->vs_clipplanes; i++) - { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); - } - } - else if(args->boolclip.clip_control[0]) - { - unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; - - for(i = 0; i < GL_LIMITS(clipplanes); i++) - { - if(args->boolclip.clip_control[1] & (1 << i)) - { - shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", - component[cur_clip++], i); - } - } - switch(cur_clip) - { - case 0: - shader_addline(buffer, "MOV TA, -helper_const.w;\n"); - break; - case 1: - shader_addline(buffer, "MOV TA.yzw, -helper_const.w;\n"); - break; - case 2: - shader_addline(buffer, "MOV TA.zw, -helper_const.w;\n"); - break; - case 3: - shader_addline(buffer, "MOV TA.w, -helper_const.w;\n"); - break; - } - shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", - args->boolclip.clip_control[0] - 1); - } - - /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c - * and the glsl equivalent - */ - if(need_helper_const(gl_info)) { - shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, helper_const.x, -TMP_OUT.w;\n"); - } else { - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); - shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); - } - - shader_addline(buffer, "MOV result.position, TMP_OUT;\n"); -} - /* GL locking is done by the caller */ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, SHADER_BUFFER *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) @@ -3750,10 +3762,12 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, } } + /* The shader starts with the main function */ + priv_ctx.in_main_func = TRUE; /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); - vshader_add_footer(This, buffer, args, &priv_ctx); + if(!priv_ctx.footer_written) vshader_add_footer(This, buffer, args, &priv_ctx); shader_addline(buffer, "END\n");

1 0

Stefan Dösinger : wined3d: Add a NOP ret handler to GLSL.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: d5e2c142252b7771b0310f457521392d168f89f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e2c142252b7771b0310f457… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 28 00:16:53 2009 +0200 wined3d: Add a NOP ret handler to GLSL. --- dlls/wined3d/glsl_shader.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b700763..501023d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2602,6 +2602,13 @@ static void shader_glsl_callnz(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, ins->src[0].reg.idx); } +static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) +{ + /* No-op. The closing } is written when a new function is started, and at the end of the shader. This + * function only suppresses the unhandled instruction warning + */ +} + /********************************************* * Pixel Shader Specific Code begins here ********************************************/ @@ -4649,7 +4656,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, - /* WINED3DSIH_RET */ NULL, + /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare,

1 0

Davide Pizzetti : cmdlgtst: Update Italian translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 7b5bdfed7b9a7f8b24292c77b12746d17fef72e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5bdfed7b9a7f8b24292c77b… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sun Jun 28 16:06:45 2009 +0200 cmdlgtst: Update Italian translation. --- programs/cmdlgtst/It.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index 069045e..c5c860c 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -40,26 +40,26 @@ CmdlgtstMenu MENU MENUITEM "&Salva", CM_U_SAVE MENUITEM SEPARATOR MENUITEM "&Colori", CM_U_COLOR - MENUITEM "&Font", CM_U_FONT + MENUITEM "&Carattere", CM_U_FONT MENUITEM SEPARATOR MENUITEM "Trova &Testo", CM_U_FIND MENUITEM "&Sostituisci Testo", CM_U_REPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_U_PRINT - MENUITEM "Pa&ge Setup", CM_U_PAGESETUP + MENUITEM "Installazione Pa&gina", CM_U_PAGESETUP } - POPUP "F&lags" + POPUP "B&andiere" { MENUITEM "Fil&e", CM_F_FILE MENUITEM SEPARATOR MENUITEM "&Colori", CM_F_COLOR - MENUITEM "&Font", CM_F_FONT + MENUITEM "&Carattere", CM_F_FONT MENUITEM SEPARATOR MENUITEM "Trova/&Sostituisci", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_F_PRINT - MENUITEM "Pa&ge Setup", CM_F_PAGESETUP + MENUITEM "Installazione Pa&gina", CM_F_PAGESETUP } POPUP "&Aiuto" @@ -72,11 +72,11 @@ CmdlgtstMenu MENU Color_Flags_Dialog DIALOG 11, 20, 207, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Font Dialog Flags" +CAPTION "Bandiere Dialogo Carattere" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Aiuto", CM_R_HELP, 148, 42, 50, 14, WS_GROUP | WS_TABSTOP CHECKBOX "CC_ENABLEHOOK", I_CC_ENABLEHOOK, 12, 12, 122, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "CC_ENABLETEMPLATE", I_CC_ENABLETEMPLATE, 12, 24, 122, 10, BS_AUTOCHECKBOX | WS_TABSTOP @@ -93,7 +93,7 @@ CAPTION "Font Dialog Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14 PUSHBUTTON "Aiuto", CM_R_HELP, 148, 42, 50, 14 CHECKBOX "CF_APPLY", I_CF_APPLY, 12, 12, 120, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "CF_ANSIONLY", I_CF_ANSIONLY, 12, 24, 120, 10, BS_AUTOCHECKBOX | WS_TABSTOP @@ -127,7 +127,7 @@ CAPTION "Trova/Sostituisci Dialog Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14 PUSHBUTTON "Aiuto", IDHELP, 148, 42, 50, 14 CHECKBOX "FR_DIALOGTERM", I_FR_DIALOGTERM, 24, 12, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "FR_DOWN", I_FR_DOWN, 24, 24, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -226,15 +226,15 @@ FONT 8, "MS Shell Dlg" UsageDialog DIALOG 183, 22, 190, 300 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ustilizzo" +CAPTION "Utilizzo" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 LTEXT "Common Dialog Test Jig Exerciser, versione 1.20", -1, 13, 48, 168, 12 LTEXT "Questo programma testa COMMDLG per Wine.", -1, 12, 72, 168, 12 - LTEXT "I Flags sono specificati nel menu flags.", -1, 12, 96, 168, 12 + LTEXT "Le Bandiere sono specificate nel menÃ¹ bandiere.", -1, 12, 96, 168, 12 LTEXT "La finestra di dialogo dei colori modifica il colore dello sfondo.", -1, 12, 120, 168, 12 - LTEXT "La finestra di dialogo dei Font modifica tutti i Font, e il loro colore se CF_EFFECTS e selezionato.", -1, 12, 144, 168, 24 + LTEXT "La finestra di dialogo dei Caratteri modifica tutti i Caratteri, e il loro colore se CF_EFFECTS e selezionato.", -1, 12, 144, 168, 24 LTEXT "L'angolo in alto a sinistra indica il percorso completo e il titolo dell'ultima operazione di apertura o salvataggio conclusa con successo.", -1, 12, 180, 168, 24 LTEXT "(c) 1999-2000, Eric Williams. I diritti sono concessi sotto la licenza di WINE. Non nascondere i sorgenti... condividili!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20

1 0

Nicolas Le Cam : cabinet/tests: Avoid use of lstrlenA when not needed.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 027bc8100c60d257f86e83bb77cf56820f1ae8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027bc8100c60d257f86e83bb7… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 27 11:34:36 2009 +0200 cabinet/tests: Avoid use of lstrlenA when not needed. --- dlls/cabinet/tests/fdi.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 1fa3851..011d94f 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -287,10 +287,9 @@ static void createTestFile(const CHAR *name) static void create_test_files(void) { - int len; + DWORD len; - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - len = lstrlenA(CURR_DIR); + len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); if(len && (CURR_DIR[len-1] == '\\')) CURR_DIR[len-1] = 0;

1 0

Nicolas Le Cam : cabinet/tests: Split an incorrect test in two valid ones.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 387e415fdc294a14a0dc83bdf4ed065df10a00bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=387e415fdc294a14a0dc83bdf… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 27 12:18:17 2009 +0200 cabinet/tests: Split an incorrect test in two valid ones. --- dlls/cabinet/tests/fdi.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 011d94f..5d470fa 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -608,8 +608,6 @@ static void test_FDICopy(void) char name[] = "extract.cab"; char path[MAX_PATH + 1]; - GetCurrentDirectoryA(MAX_PATH, path); - set_cab_parameters(&cabParams); hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, @@ -621,6 +619,31 @@ static void test_FDICopy(void) FCIDestroy(hfci); + lstrcpyA(path, CURR_DIR); + + /* path doesn't have a trailing backslash */ + if (lstrlenA(path) > 2) + { + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, + fdi_write, fdi_close, fdi_seek, + cpuUNKNOWN, &erf); + + SetLastError(0xdeadbeef); + ret = FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + todo_wine + { + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + FDIDestroy(hfdi); + } + else + skip("Running on a root drive directory.\n"); + + lstrcatA(path, "\\"); + hfdi = FDICreate(fdi_alloc, fdi_free, fdi_open, fdi_read, fdi_write, fdi_close, fdi_seek, cpuUNKNOWN, &erf); @@ -628,14 +651,12 @@ static void test_FDICopy(void) /* cabinet with no files or folders */ SetLastError(0xdeadbeef); ret = FDICopy(hfdi, name, path, 0, CopyProgress, NULL, 0); - ok(ret == FALSE, "Expected FALSE, got %d\n", ret); todo_wine - { - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(GetLastError() == 0, "Expected 0f, got %d\n", GetLastError()); FDIDestroy(hfdi); + DeleteFileA(name); }

1 0

André Hentschel : taskmgr: Update German translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 3cf495c1182e118e2c68ee583d5b2aaa187e9183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf495c1182e118e2c68ee583… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 27 15:12:33 2009 +0200 taskmgr: Update German translation. --- programs/taskmgr/De.rc | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 7b13747..8b96bc2 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -3,6 +3,7 @@ * German Language Support * * Copyright 2005 Henning Gerhardt + * Copyright 2009 Andr� Hentschel * * * This library is free software; you can redistribute it and/or @@ -467,6 +468,7 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Setzt den Prozess in die NORMAL-Priorit�tsklasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Setzt den Prozess in die NIEDRIGER ALS NORMAL-Priorit�tsklasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Setzt den Prozess in die NIEDRIG-Priorit�tsklasse" + ID_PROCESS_PAGE_DEBUGCHANNELS "Stellt Debug-Kan�le ein" END STRINGTABLE DISCARDABLE @@ -517,3 +519,38 @@ BEGIN IDS_IOOTHER "E/A (Andere)" IDS_IOOTHERBYTES "E/A-Bytes (Andere)" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WARNING_TITLE "Task Manager Warnung" + IDS_PRIORITY_CHANGE_MESSAGE "WARNUNG: �nderung der Priorit�tsklasse dieses Prozesses\n\ + kann zu unerw�nschten Ergebnissen und Systeminstabilit�t\n\ + f�hren. Sind Sie sicher, dass Sie sie �ndern m�chten?" + IDS_PRIORITY_UNABLE2CHANGE "Die Priorit�t kann nicht ge�ndert werden " + IDS_TERMINATE_MESSAGE "WARNUNG: Beenden des Prozesses kann zu unerw�nschten\n\ + Ergebnissen und Systeminstabilit�t, sowie Datenverlust\n\ + f�hren. Dem Prozess wird es nicht m�glich sein ge�nderte\n\ + Daten oder seinen Zustand zu speichern.\n\ + Sind Sie sicher, dass Sie inh beenden m�chten?" + IDS_TERMINATE_UNABLE2TERMINATE "Der Prozess konnte nicht beendet werden" + IDS_DEBUG_MESSAGE "WARNUNG: Den Prozess zu debuggen kann zu Datenverlust\n\ + f�hren. Sind Sie sicher, dass Sie ihn debuggen m�chten?" + IDS_DEBUG_UNABLE2DEBUG "Konnte den Prozess nicht debuggen" + IDS_AFFINITY_ERROR_MESSAGE "Der Prozess muss mindestens mit einem Prozessor affin sein" + IDS_AFFINITY_ERROR_TITLE "Option nicht m�glich" + IDS_AFFINITY_UNABLE2ACCESS "Die Prozessoraffinit�t konnte nicht ge�ndert werden" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "Leerlauf Prozess" + IDS_APPLICATION_NOT_RESPONDING "Anwortet nicht" + IDS_APPLICATION_RUNNING "l�uft" + IDS_APPLICATION_TASK "Task" + IDS_APPLICATION_STATUS "Status" + IDS_DEBUG_CHANNEL "Debug Kan�le" + IDS_DEBUG_CHANNEL_FIXME "Fixme" + IDS_DEBUG_CHANNEL_ERR "Err" + IDS_DEBUG_CHANNEL_WARN "Warn" + IDS_DEBUG_CHANNEL_TRACE "Trace" +END

1 0