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

Henri Verbeet : wined3d: Reuse the shader buffer between shaders.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: bddc4d3f0d5b999d56a7049f34272cd7d1dae692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddc4d3f0d5b999d56a7049f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:07 2009 +0200 wined3d: Reuse the shader buffer between shaders. --- dlls/wined3d/baseshader.c | 9 +++- dlls/wined3d/glsl_shader.c | 117 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 65 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddc4d3f0d5b999d56a70…

1 0

Henri Verbeet : wined3d: Rename "SHADER_BUFFER" to something sane.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 40b411958bd6dba819d92eea8b796da9762de804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b411958bd6dba819d92eea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:08 2009 +0200 wined3d: Rename "SHADER_BUFFER" to something sane. --- dlls/wined3d/arb_program_shader.c | 140 +++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 12 ++-- dlls/wined3d/glsl_shader.c | 50 +++++++------- dlls/wined3d/wined3d_private.h | 27 ++++---- 4 files changed, 116 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b411958bd6dba819d92…

1 0

Henri Verbeet : wined3d: Allow shader_buffer_init() to fail.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 483d552e219310ef9962a8ce0e365c8f5d2c0663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d552e219310ef9962a8ce0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:09 2009 +0200 wined3d: Allow shader_buffer_init() to fail. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c0ad40..e48d5e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4006,7 +4006,12 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * pixelshader_update_samplers(&shader->baseShader.reg_maps, ((IWineD3DDeviceImpl *)shader->baseShader.device)->stateBlock->textures); - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_pshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -4076,7 +4081,12 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_vshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -5541,7 +5551,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi } /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } shader_addline(&buffer, "!!ARBfp1.0\n"); @@ -6304,7 +6318,11 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct arbfp_blit_priv *priv = device->blit_priv; /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2f9410a..3590d21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -146,10 +146,17 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) buffer->newline = TRUE; } -void shader_buffer_init(struct wined3d_shader_buffer *buffer) +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) { buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); + if (!buffer->buffer) + { + ERR("Failed to allocate shader buffer memory.\n"); + return FALSE; + } + shader_buffer_clear(buffer); + return TRUE; } void shader_buffer_free(struct wined3d_shader_buffer *buffer) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3433201..07b1cb2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4456,7 +4456,11 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vshader_constantsF), GL_LIMITS(pshader_constantsF))) + 1; - shader_buffer_init(&priv->shader_buffer); + if (!shader_buffer_init(&priv->shader_buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + goto fail; + } priv->stack = HeapAlloc(GetProcessHeap(), 0, stack_size * sizeof(*priv->stack)); if (!priv->stack) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ecc3ee3..164e3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2601,7 +2601,7 @@ typedef struct IWineD3DBaseShaderImpl { } IWineD3DBaseShaderImpl; void shader_buffer_clear(struct wined3d_shader_buffer *buffer); -void shader_buffer_init(struct wined3d_shader_buffer *buffer); +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer); void shader_buffer_free(struct wined3d_shader_buffer *buffer); void shader_cleanup(IWineD3DBaseShader *iface); void shader_dump_src_param(const struct wined3d_shader_src_param *param,

1 0

Henri Verbeet : wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader().
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 95d9b1271fd513dc63eb27adef20079e53c8ab3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d9b1271fd513dc63eb27ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:10 2009 +0200 wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07b1cb2..34266e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3676,7 +3676,6 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct { const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -3718,16 +3717,15 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - fragcolor = "gl_FragData[0]"; if(args->srgb_correction) { - shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", - fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", + srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, srgb_sub_high, srgb_sub_high, srgb_sub_high); - shader_addline(buffer, "tmp1.xyz = %s.xyz * srgb_mul_low.xyz;\n", fragcolor); - shader_addline(buffer, "%s.x = %s.x < srgb_comparison.x ? tmp1.x : tmp0.x;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.y = %s.y < srgb_comparison.y ? tmp1.y : tmp0.y;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.z = %s.z < srgb_comparison.z ? tmp1.z : tmp0.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s = clamp(%s, 0.0, 1.0);\n", fragcolor, fragcolor); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * srgb_mul_low.xyz;\n"); + shader_addline(buffer, "gl_FragData[0].x = gl_FragData[0].x < srgb_comparison.x ? tmp1.x : tmp0.x;\n"); + shader_addline(buffer, "gl_FragData[0].y = gl_FragData[0].y < srgb_comparison.y ? tmp1.y : tmp0.y;\n"); + shader_addline(buffer, "gl_FragData[0].z = gl_FragData[0].z < srgb_comparison.z ? tmp1.z : tmp0.z;\n"); + shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } /* Pixel shader < 3.0 do not replace the fog stage. * This implements linear fog computation and blending. @@ -3743,19 +3741,19 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "float fogstart = -1.0 / (gl_Fog.end - gl_Fog.start);\n"); shader_addline(buffer, "float fogend = gl_Fog.end * -fogstart;\n"); shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * fogstart + fogend, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP: /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP2: /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; } }

1 0

Henri Verbeet : wined3d: Fix some cast-qual warnings.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 9cf78880022626080d6ee69a2ed4b7cd7e436d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf78880022626080d6ee69a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:11 2009 +0200 wined3d: Fix some cast-qual warnings. --- dlls/wined3d/baseshader.c | 8 ++++---- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3590d21..12fc28c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -750,7 +750,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } reg_maps->loop_depth = max_loop_depth; - This->baseShader.functionLength = ((char *)pToken - (char *)byte_code); + This->baseShader.functionLength = ((const char *)pToken - (const char *)byte_code); return WINED3D_OK; } @@ -925,13 +925,13 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)reg->immconst_data); + TRACE("%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bed6d84..bd5ddba 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -577,7 +577,7 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This) +BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34266e9..82a5fb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1335,13 +1335,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164e3bb..d8c56e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2395,7 +2395,7 @@ struct wined3d_buffer extern const IWineD3DBufferVtbl wined3d_buffer_vtbl; const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object); -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This); +BYTE *buffer_get_sysmem(struct wined3d_buffer *This); /* IWineD3DRendertargetView */ struct wined3d_rendertarget_view

1 0

Anders Jonsson : winemine: Add ellipses for menu entries that open new dialog windows.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 046e00beeffc570b780a6b8dc7e6a57b686d0a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046e00beeffc570b780a6b8dc… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Mar 4 01:59:35 2009 +0100 winemine: Add ellipses for menu entries that open new dialog windows. --- programs/winemine/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index 634a3e8..dfb37e5 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -40,12 +40,12 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Beginner", IDM_BEGINNER MENUITEM "&Advanced", IDM_ADVANCED MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Custom", IDM_CUSTOM + MENUITEM "&Custom...", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+X", IDM_EXIT } POPUP "&Info" { - MENUITEM "&Fastest Times", IDM_TIMES + MENUITEM "&Fastest Times...", IDM_TIMES MENUITEM "&About", IDM_ABOUT } }

1 0

Anders Jonsson : winemine: Add Swedish translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: c2ef4e79fcbd1bd7776abdf2aaa89404b2d0fa4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ef4e79fcbd1bd7776abdf2a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Jul 9 09:52:01 2009 +0200 winemine: Add Swedish translation. --- programs/winemine/Makefile.in | 1 + programs/winemine/Sv.rc | 98 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 7e5d91b..7146d92 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -30,6 +30,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Tr.rc \ Zh.rc \ rsrc.rc diff --git a/programs/winemine/Sv.rc b/programs/winemine/Sv.rc new file mode 100644 index 0000000..498feb7 --- /dev/null +++ b/programs/winemine/Sv.rc @@ -0,0 +1,98 @@ +/* + * WineMine + * Swedish Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "Minor" + IDS_NOBODY, "Ingen" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "A&lternativ" { + MENUITEM "&Nytt\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Markera fråga", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "Ny&börjare", IDM_BEGINNER + MENUITEM "&Avancerad", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "An&passad...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "A&vsluta\tAlt+X", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Snabbaste tider...", IDM_TIMES + MENUITEM "&Om", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Snabbaste tider" +{ + GROUPBOX "Snabbaste tider", -1, 10, 10, 140, 45 + LTEXT "Nybörjare", -1, 20, 20, 40, 8 + LTEXT "Avancerad", -1, 20, 30, 40, 8 + LTEXT "Expert", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Gratulerar!" +{ + LTEXT "Ange ditt namn", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Anpassat spel" +{ + LTEXT "Rader", -1, 5, 5, 30, 10 + LTEXT "Kolumner", -1, 5, 35, 35, 10 + LTEXT "Minor", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 +}

1 0

Frédéric Delanoy : shlwapi: Fix French translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 45e9d0d2cbf537137284c96ec841e73f7d8881f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e9d0d2cbf537137284c96ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:24:55 2009 +0200 shlwapi: Fix French translation. --- dlls/shlwapi/shlwapi_Fr.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc index 26cada0..745b4fd 100644 --- a/dlls/shlwapi/shlwapi_Fr.rc +++ b/dlls/shlwapi/shlwapi_Fr.rc @@ -20,11 +20,14 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Erreur!" +CAPTION "Erreur !" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20

1 0

Frédéric Delanoy : msrle32: Fix French translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: dc4463e142ea9e041bdf9d02396c62ef4c3d17be URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4463e142ea9e041bdf9d023… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:32:48 2009 +0200 msrle32: Fix French translation. --- dlls/msrle32/msrle_Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msrle32/msrle_Fr.rc b/dlls/msrle32/msrle_Fr.rc index 001d37e..f45892c 100644 --- a/dlls/msrle32/msrle_Fr.rc +++ b/dlls/msrle32/msrle_Fr.rc @@ -1,7 +1,7 @@ /* * French resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,14 @@ #include "msrle_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine: d�codeur/encodeur vid�o MS-RLE" - IDS_ABOUT "Wine: d�codeur/encodeur vid�o MS-RLE\nCopyright 2002 par Michael G�nnewig" + IDS_DESCRIPTION "Wine : codec vidéo MS-RLE" + IDS_ABOUT "Wine : codec vidéo MS-RLE\nCopyright 2002 par Michael Günnewig" }

1 0

Frédéric Delanoy : appwiz.cpl: Fix French translation & UI display.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 1cd85126950e8b5123d6750a5e9a4ad8632d1d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd85126950e8b5123d6750a5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 18:11:59 2009 +0200 appwiz.cpl: Fix French translation & UI display. --- dlls/appwiz.cpl/Fr.rc | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 0c860b3..4c29010 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -1,5 +1,5 @@ /* -* Ressources fran�aises pour Ajout/suppression de programmes +* Ressources françaises pour Ajout/Suppression de programmes * * Copyright 2008 David Adam * @@ -21,6 +21,9 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE @@ -29,28 +32,28 @@ STRINGTABLE IDS_CPL_DESC, "Vous permet d'installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." IDS_TAB1_TITLE, "Applications" - IDS_UNINSTALL_FAILED, "Impossible d'ex�cuter le d�sinstalleur '%s'. Voulez-vous supprimer l'entr�e de d�sinstallation de ce programme dans la base de registres ?" - IDS_NOT_SPECIFIED, "Non sp�cifi�" + IDS_UNINSTALL_FAILED, "Impossible d'exécuter le désinstalleur « %s ». Voulez-vous supprimer l'entrée de désinstallation de ce programme de la base de registre ?" + IDS_NOT_SPECIFIED, "Non spécifié" IDS_COLUMN_NAME, "Nom" - IDS_COLUMN_PUBLISHER, "�diteur" + IDS_COLUMN_PUBLISHER, "Éditeur" IDS_COLUMN_VERSION, "Version" IDS_INSTALL_FILTER, "Programmes d'installation\0*instal*.exe;*setup*.exe;*.msi\0Programmes (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Installation/D�sinstallation" +CAPTION "Installation/Désinstallation" FONT 8, "MS Shell Dlg" { -CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "&Installer", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 +CONTROL "Pour installer un nouveau programme à partir d'une disquette, d'un CD-ROM ou d'un disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 26, 70, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Les logiciels suivants peuvent �tre d�sinstall�s automatiquement.\nPour supprimer un programme ou modifier ses composants, s�lectionnez-le dans la liste, et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Les logiciels suivants peuvent être désinstallés automatiquement.\nPour supprimer un programme ou modifier ses composants, sélectionnez-le dans la liste et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 - CONTROL "&Infos de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 198, 70, 14 + CONTROL "&Informations de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 198, 87, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } @@ -60,15 +63,15 @@ CAPTION "Informations de support" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 - CONTROL "�diteur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 - CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "T�l�phone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Mises � jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "Les informations suivantes peuvent être utilisées pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Éditeur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 54, 8 + CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 54, 8 + CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 54, 8 + CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 54, 8 + CONTROL "Téléphone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 54, 8 + CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 54, 8 + CONTROL "Mises à jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 54, 8 + CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 54, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8

1 0