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

Stefan Dösinger : wined3d: Remove a TODO.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 8d4ac8ac1b64403e22f60ac79f946c064e656819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4ac8ac1b64403e22f60ac79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:18:10 2009 +0100 wined3d: Remove a TODO. init_materials() doesn't exist, and I don't know what the TODO means with primitive type (the diffuse stuff is already handled properly). --- dlls/wined3d/state.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 329444c..35f6d0a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1146,7 +1146,6 @@ void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); } -/* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; GLenum Parm = 0;

1 0

Stefan Dösinger : wined3d: Fix some whitespace.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 703dcca61b73933f159c1b37acecdd58a6382aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703dcca61b73933f159c1b37a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:22:09 2009 +0100 wined3d: Fix some whitespace. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf5716a..ee7ab90 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3226,23 +3226,23 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), set_bumpmat_arbfp }, 0 }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlum_arbfp }, 0 }, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlum_arbfp }, 0 }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, 0 }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, 0 }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, 0 }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, 0 }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, 0 }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, 0 }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, 0 }, - { STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, - { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, - { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, - { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, - { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, - { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, - { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, + {STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, 0 }, + {STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, 0 }, + {STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, 0 }, + {STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, 0 }, + {STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, 0 }, + {STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, 0 }, + {STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, 0 }, + {STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, 0 }, + {STATE_PIXELSHADER, { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + {STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, + {STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, 0 }, + {STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, + {STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, {STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, @@ -3251,7 +3251,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, - { STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_arb_specularenable}, 0 }, + {STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_arb_specularenable}, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Update a comment.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 3fbdb64270a48163e96195495fb828299096f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbdb64270a48163e96195495… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 23 19:27:13 2009 +0100 wined3d: Update a comment. shader_select takes care of compiling the shader since we have the shader duplication infrastructure. However, there's still a motivation to skip the shader_select call if the vertex shader is dirty. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ee7ab90..1bebb21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3045,8 +3045,8 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, * type overwrites GL_ARB_fragment_program. This is currently the case with GLSL. If we really want to use * atifs or nvrc pixel shaders with arb fragment programs we'd have to disable GL_FRAGMENT_PROGRAM_ARB here * - * Don't call shader_select if the vertex shader is dirty, because some shader backends(GLSL) need both shaders - * to be compiled before activating them(needs some cleanups in the shader backend interface) + * Don't call shader_select if the vertex shader is dirty, because it will be called later on by the vertex + * shader handler */ if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, use_pshader, use_vshader);

1 0

Stefan Dösinger : wined3d: Advertise post pixelshader blending for a few more formats.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 3e099d014750fa5fc2a10c6aa4bf23ddc80a1fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e099d014750fa5fc2a10c6aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 25 21:20:39 2009 +0100 wined3d: Advertise post pixelshader blending for a few more formats. Windows advertises it on all these formats(Nvidia Geforce 7400), and Trackmania Nations needs it on D3DFMT_Q8W8V8U8 to accept ps_3_0 support. --- dlls/wined3d/utils.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 048be9e..02f5255 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -203,19 +203,19 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT2, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT4, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, 0, 0, 0}, @@ -311,29 +311,29 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Luminance */ {WINED3DFMT_L8, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A8L8, GL_LUMINANCE8_ALPHA8, GL_SLUMINANCE8_ALPHA8_EXT, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_A4L4, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0}, /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_DSDT8_NV, GL_DSDT8_NV, 0, GL_DSDT_NV, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_L6V5U5, GL_DSDT8_MAG8_NV, GL_DSDT8_MAG8_NV, 0, GL_DSDT_MAG_NV, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_X8L8V8U8, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_R8G8B8A8_SNORM, GL_SIGNED_RGBA8_NV, GL_SIGNED_RGBA8_NV, 0, GL_RGBA, GL_BYTE, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_W11V11U10, 0, 0, 0, 0, 0, 0}, @@ -352,19 +352,19 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D24S8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D24X8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, {WINED3DFMT_D24X4S4, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH}, {WINED3DFMT_L16, GL_LUMINANCE16_EXT, GL_LUMINANCE16_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_SHORT, - WINED3DFMT_FLAG_FILTERING}, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, {WINED3DFMT_D32F_LOCKABLE, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH},

1 0

Christian Costa : winemp3: Add missing sampling frequencies.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: a513d401ac4f88c390e7b40cb796901a34fa9fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a513d401ac4f88c390e7b40cb… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Mar 28 11:14:23 2009 +0100 winemp3: Add missing sampling frequencies. --- dlls/winemp3.acm/mpegl3.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index e0f0ebd..3ebd94c 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -75,16 +75,26 @@ static const Format PCM_Formats[] = { {1, 8, 8000}, {2, 8, 8000}, {1, 16, 8000}, {2, 16, 8000}, {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, + {1, 8, 12000}, {2, 8, 12000}, {1, 16, 12000}, {2, 16, 12000}, + {1, 8, 16000}, {2, 8, 16000}, {1, 16, 16000}, {2, 16, 16000}, {1, 8, 22050}, {2, 8, 22050}, {1, 16, 22050}, {2, 16, 22050}, + {1, 8, 24000}, {2, 8, 24000}, {1, 16, 24000}, {2, 16, 24000}, + {1, 8, 32000}, {2, 8, 32000}, {1, 16, 32000}, {2, 16, 32000}, {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, - {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000}, + {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000} }; static const Format MPEG3_Formats[] = { - {1, 0, 8000}, {2, 0, 8000}, {1, 0, 11025}, {2, 0, 11025}, - {1, 0, 22050}, {2, 0, 22050}, {1, 0, 44100}, {2, 0, 44100}, - {1, 0, 48000}, {2, 0, 48000}, + {1, 0, 8000}, {2, 0, 8000}, + {1, 0, 11025}, {2, 0, 11025}, + {1, 0, 12000}, {2, 0, 12000}, + {1, 0, 16000}, {2, 0, 16000}, + {1, 0, 22050}, {2, 0, 22050}, + {1, 0, 24000}, {2, 0, 24000}, + {1, 0, 32000}, {2, 0, 32000}, + {1, 0, 44100}, {2, 0, 44100}, + {1, 0, 48000}, {2, 0, 48000} }; #define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))

1 0

Aurimas Fischer : appwiz.cpl: Add Lithuanian translation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: adcca63f79aa7f1917041e068a25033aaa6b0383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adcca63f79aa7f1917041e068… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 16:36:36 2009 +0200 appwiz.cpl: Add Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 82 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc new file mode 100644 index 0000000..6f524ac --- /dev/null +++ b/dlls/appwiz.cpl/Lt.rc @@ -0,0 +1,82 @@ +/* +* Add/Remove Programs Lithuanian resources +* +* Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> +* +* 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 +* +*/ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Pridėti/pašalinti programas" + IDS_CPL_DESC, "Leidžia įdiegti naują programinę įrangą, ar pašalinti jau įdiegtą iš jūsų kompiuterio." + IDS_TAB1_TITLE, "Programos" + + IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos '%s'. Ar norite pašalinti programos šalinimo įrašą iš registro?" + IDS_NOT_SPECIFIED, "Nenurodyta" + + IDS_COLUMN_NAME, "Vardas" + IDS_COLUMN_PUBLISHER, "Leidėjas" + IDS_COLUMN_VERSION, "Versija" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Įdiegti/Pašalinti" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite 'Įdiegti'.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Į&diegti...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 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 "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite 'Įdiegti/Pašalinti'.", 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 "Įdiegti/Pa&šalinti...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&Priežiūros informacija...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 156, 198, 84, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Priežiūros informacija" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Gerai", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ši informacija gali būti panaudota programos '%s' techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Leidėjas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontaktas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Priežiūros informacija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 72, 8 + CONTROL "Priežiūros telefonas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Skaityk:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produkto atnaujinimai:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 72, 8 + CONTROL "Komentarai:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 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 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 843662a..7764463 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -29,6 +29,7 @@ #include "Fr.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pt.rc"

1 0

Aurimas Fischer : browseui: Add Lithuanian translation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: e76719e25b14f4d82d6d6007754821e5eb6e111f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76719e25b14f4d82d6d60077… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sat Mar 28 14:11:44 2009 +0200 browseui: Add Lithuanian translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Lt.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 8ad4672..c16391f 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -29,6 +29,7 @@ #include "rsrc_Es.rc" #include "rsrc_Fr.rc" #include "rsrc_Ko.rc" +#include "rsrc_Lt.rc" #include "rsrc_Nl.rc" #include "rsrc_No.rc" #include "rsrc_Pl.rc" diff --git a/dlls/browseui/rsrc_Lt.rc b/dlls/browseui/rsrc_Lt.rc new file mode 100644 index 0000000..8814534 --- /dev/null +++ b/dlls/browseui/rsrc_Lt.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Atsisakoma..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Atsisakyti", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +#pragma code_page(default)

1 0

Aurimas Fischer : devenum: Add Lithuanian translation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 2af10186b6603eebf166791c3515a9381de2c545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af10186b6603eebf166791c3… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Mar 29 17:39:50 2009 +0300 devenum: Add Lithuanian translation. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index c5ad0fc..b9ff4a5 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -161,3 +161,12 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT 9 "기본 웨이브 출력 장치" 10 "기본 미디출력 장치" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +{ + 7 "Numatytasis DirectSound" + 8 "DirectSound: %s" + 9 "Numatytasis WaveOut įrenginys" + 10 "Numatytasis MidiOut įrenginys" +}

1 0

Aurimas Fischer : gphoto2.ds: Add Lithuanian translation.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: 4bec03e3c51c86b69651c99b8e75369c6cca9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bec03e3c51c86b69651c99b8… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Mar 29 18:16:20 2009 +0300 gphoto2.ds: Add Lithuanian translation. --- dlls/gphoto2.ds/gphoto2_Lt.rc | 60 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Lt.rc b/dlls/gphoto2.ds/gphoto2_Lt.rc new file mode 100644 index 0000000..de2a525 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Lt.rc @@ -0,0 +1,60 @@ +/* + * Lithuanian resources for Twain + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Failai kameroje" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importuoti pažymėtus",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Peržiūra",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importuoti visus",IDC_IMPORTALL,80,252,64,14 + CONTROL "Praleisti šį dialogo langą",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,90,14 + PUSHBUTTON "Išeiti",IDC_EXIT,329,252,36,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Perduodama" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Perduodama... Prašome palaukti",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Jungiamasi prie kameros" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Jungiamasi prie kameros... Prašome palaukti",IDC_STATIC,124,58, + 140,8 +END + +#pragma code_page(default) diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 79087c8..7746785 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -32,6 +32,7 @@ #include "gphoto2_Es.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Ko.rc" +#include "gphoto2_Lt.rc" #include "gphoto2_Nl.rc" #include "gphoto2_No.rc" #include "gphoto2_Pl.rc"

1 0

Rob Shearman : include: Add definition for CreateProcessWithLogonW and associated flags.
by Alexandre Julliard 30 Mar '09

30 Mar '09

Module: wine Branch: master Commit: bbe7927ed5dc93a469b2c18a4d3dfd2209b3b2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe7927ed5dc93a469b2c18a4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Mar 29 18:39:15 2009 +0100 include: Add definition for CreateProcessWithLogonW and associated flags. --- include/winbase.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 3f0a24e..650344f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1270,6 +1270,10 @@ typedef struct _WIN32_STREAM_ID { #define DDD_NO_BROADCAST_SYSTEM 0x00000008 #define DDD_LUID_BROADCAST_DRIVE 0x00000010 +#define LOGON_WITH_PROFILE 0x00000001 +#define LOGON_NETCREDENTIALS_ONLY 0x00000002 +#define LOGON_ZERO_PASSWORD_BUFFER 0x80000000 + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -1392,6 +1396,7 @@ WINBASEAPI BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTE WINADVAPI BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION); WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) +WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);

1 0