wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Jacek Caban : mshtml.idl: Added DispHTMLTextAreaElement declaration.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: fe3e19c8a46a9f862d97b4157f8b4719a2d3ee06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3e19c8a46a9f862d97b4157… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 23:53:26 2010 +0100 mshtml.idl: Added DispHTMLTextAreaElement declaration. --- include/mshtml.idl | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index ee01a8c..98edbbc 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -8971,6 +8971,92 @@ interface IHTMLTextAreaElement : IDispatch } /***************************************************************************** + * DispHTMLTextAreaElement dispinterface + */ +[ + hidden, + uuid(3050f521-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLTextAreaElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_TYPE)] + BSTR type(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_VALUE), displaybind, bindable] + void value(BSTR v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_VALUE), displaybind, bindable] + BSTR value(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_STATUS)] + void status(VARIANT v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_STATUS)] + VARIANT status(); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_FORM)] + IHTMLFormElement *form(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] + void defaultValue(BSTR v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] + BSTR defaultValue(); + + [id(DISPID_IHTMLTEXTAREAELEMENT_SELECT)] + void select(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] + void onchange(VARIANT v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] + VARIANT onchange(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] + void onselect(VARIANT v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] + VARIANT onselect(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_READONLY), displaybind, bindable] + void readOnly(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_READONLY), displaybind, bindable] + VARIANT_BOOL readOnly(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ROWS), displaybind, bindable] + void rows(LONG v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ROWS), displaybind, bindable] + LONG rows(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_COLS), displaybind, bindable] + void cols(LONG v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_COLS), displaybind, bindable] + LONG cols(); + + [propput, id(DISPID_IHTMLTEXTAREAELEMENT_WRAP), displaybind, bindable] + void wrap(BSTR v); + + [propget, id(DISPID_IHTMLTEXTAREAELEMENT_WRAP), displaybind, bindable] + BSTR wrap(); + + [id(DISPID_IHTMLTEXTAREAELEMENT_CREATETEXTRANGE)] + IHTMLTxtRange *createTextRange(); +} + +/***************************************************************************** * DispHTMLUnknownElement interface */ [

1 0

Henri Verbeet : wined3d: Dump the GLSL shader source on link failure.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 9f21f2c2f20c7ce770030eb99eba86e115739adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f21f2c2f20c7ce770030eb99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:27 2010 +0100 wined3d: Dump the GLSL shader source on link failure. Mostly to help Mesa developers diagnose bug reports involving GLSL compile failures, but it's convenient in general to have the source all in one place. --- dlls/wined3d/glsl_shader.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1179f51..dc1dc28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -156,6 +156,20 @@ struct glsl_vshader_private UINT num_gl_shaders, shader_array_size; }; +static const char *debug_gl_shader_type(GLenum type) +{ + switch (type) + { +#define WINED3D_TO_STR(u) case u: return #u + WINED3D_TO_STR(GL_VERTEX_SHADER_ARB); + WINED3D_TO_STR(GL_GEOMETRY_SHADER_ARB); + WINED3D_TO_STR(GL_FRAGMENT_SHADER_ARB); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("UNKNOWN(%#x)", type); + } +} + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -238,6 +252,81 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA } } +/* GL locking is done by the caller. */ +static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_info, GLhandleARB program) +{ + GLint i, object_count, source_size; + GLhandleARB *objects; + char *source = NULL; + + GL_EXTCALL(glGetObjectParameterivARB(program, GL_OBJECT_ATTACHED_OBJECTS_ARB, &object_count)); + objects = HeapAlloc(GetProcessHeap(), 0, object_count * sizeof(*objects)); + if (!objects) + { + ERR("Failed to allocate object array memory.\n"); + return; + } + + GL_EXTCALL(glGetAttachedObjectsARB(program, object_count, NULL, objects)); + for (i = 0; i < object_count; ++i) + { + char *ptr, *line; + GLint tmp; + + GL_EXTCALL(glGetObjectParameterivARB(objects[i], GL_OBJECT_SHADER_SOURCE_LENGTH_ARB, &tmp)); + + if (!source || source_size < tmp) + { + HeapFree(GetProcessHeap(), 0, source); + + source = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, tmp); + if (!source) + { + ERR("Failed to allocate %d bytes for shader source.\n", tmp); + HeapFree(GetProcessHeap(), 0, objects); + return; + } + source_size = tmp; + } + + FIXME("Object %u:\n", objects[i]); + GL_EXTCALL(glGetObjectParameterivARB(objects[i], GL_OBJECT_SUBTYPE_ARB, &tmp)); + FIXME(" GL_OBJECT_SUBTYPE_ARB: %s.\n", debug_gl_shader_type(tmp)); + GL_EXTCALL(glGetObjectParameterivARB(objects[i], GL_OBJECT_COMPILE_STATUS_ARB, &tmp)); + FIXME(" GL_OBJECT_COMPILE_STATUS_ARB: %d.\n", tmp); + FIXME("\n"); + + ptr = source; + GL_EXTCALL(glGetShaderSourceARB(objects[i], source_size, NULL, source)); + while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + FIXME("\n"); + } + + HeapFree(GetProcessHeap(), 0, source); + HeapFree(GetProcessHeap(), 0, objects); +} + +/* GL locking is done by the caller. */ +static void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLhandleARB program) +{ + GLint tmp; + + if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return; + + GL_EXTCALL(glGetObjectParameterivARB(program, GL_OBJECT_TYPE_ARB, &tmp)); + if (tmp == GL_PROGRAM_OBJECT_ARB) + { + GL_EXTCALL(glGetObjectParameterivARB(program, GL_OBJECT_LINK_STATUS_ARB, &tmp)); + if (!tmp) + { + FIXME("Program %u link status invalid.\n", program); + shader_glsl_dump_program_source(gl_info, program); + } + } + + print_glsl_info_log(gl_info, program); +} + /** * Loads (pixel shader) samplers */ @@ -4240,7 +4329,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Link the program */ TRACE("Linking GLSL shader program %u\n", programId); GL_EXTCALL(glLinkProgramARB(programId)); - print_glsl_info_log(gl_info, programId); + shader_glsl_validate_link(gl_info, programId); entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); @@ -4396,7 +4485,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, GL_EXTCALL(glAttachObjectARB(program_id, pshader_id)); GL_EXTCALL(glLinkProgramARB(program_id)); - print_glsl_info_log(gl_info, program_id); + shader_glsl_validate_link(gl_info, program_id); /* Once linked we can mark the shaders for deletion. They will be deleted once the program * is destroyed

1 0

Henri Verbeet : wined3d: Get rid of an unnecessary GetContainer() call in surface_blt_to_drawable().
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: c03d367d3cec0682621f418df62090e69be049ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03d367d3cec0682621f418df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:26 2010 +0100 wined3d: Get rid of an unnecessary GetContainer() call in surface_blt_to_drawable(). --- dlls/wined3d/surface.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 233f079..2bc08b8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4665,11 +4665,10 @@ static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DBaseTextureImpl *texture; struct wined3d_context *context; struct coords coords[4]; RECT rect; - IWineD3DSwapChain *swapchain; - IWineD3DBaseTexture *texture; GLenum bind_target; struct float_rect f; @@ -4813,22 +4812,14 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT wglFlush(); /* Flush to ensure ordering across contexts. */ - if(SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain))) - { - IWineD3DSwapChain_Release(swapchain); - } - else + /* We changed the filtering settings on the texture. Inform the + * container about this to get the filters reset properly next draw. */ + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DBaseTexture, (void **)&texture))) { - /* We changed the filtering settings on the texture. Inform the container about this to get the filters - * reset properly next draw - */ - if(SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DBaseTexture, (void **) &texture))) - { - ((IWineD3DBaseTextureImpl *) texture)->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; - ((IWineD3DBaseTextureImpl *) texture)->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; - ((IWineD3DBaseTextureImpl *) texture)->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; - IWineD3DBaseTexture_Release(texture); - } + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); } context_release(context);

1 0

Henri Verbeet : wined3d: Prune invalid states from the state table.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: d66f5345e6857ae586117ef4d404c23c7f90272f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66f5345e6857ae586117ef4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:25 2010 +0100 wined3d: Prune invalid states from the state table. --- dlls/wined3d/state.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 17a6704..5384f3e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5685,6 +5685,27 @@ static void multistate_apply_3(DWORD state, IWineD3DStateBlockImpl *stateblock, stateblock->device->multistate_funcs[state][2](state, stateblock, context); } +static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_gl_info *gl_info) +{ + unsigned int start, last, i; + + start = STATE_TEXTURESTAGE(gl_info->limits.texture_stages, 0); + last = STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE); + for (i = start; i <= last; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; + } + + start = STATE_TRANSFORM(WINED3DTS_TEXTURE0 + gl_info->limits.texture_stages); + last = STATE_TRANSFORM(WINED3DTS_TEXTURE0 + MAX_TEXTURES - 1); + for (i = start; i <= last; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; + } +} + static void validate_state_table(struct StateEntry *state_table) { unsigned int i; @@ -5800,6 +5821,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ } } + prune_invalid_states(StateTable, gl_info); validate_state_table(StateTable); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Add some basic state table validation.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 19516bf69f905c6d63f49744117edc240d357f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19516bf69f905c6d63f497441… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:24 2010 +0100 wined3d: Add some basic state table validation. --- dlls/wined3d/state.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 35482ee..17a6704 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5685,6 +5685,22 @@ static void multistate_apply_3(DWORD state, IWineD3DStateBlockImpl *stateblock, stateblock->device->multistate_funcs[state][2](state, stateblock, context); } +static void validate_state_table(struct StateEntry *state_table) +{ + unsigned int i; + + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + DWORD rep = state_table[i].representative; + if (rep && !state_table[rep].representative) + { + ERR("State %s (%#x) has invalid representative %s (%#x).\n", + debug_d3dstate(i), i, debug_d3dstate(rep), rep); + state_table[i].representative = 0; + } + } +} + HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_gl_info *gl_info, const struct StateEntryTemplate *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) @@ -5784,6 +5800,8 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ } } + validate_state_table(StateTable); + return WINED3D_OK; out_of_mem:

1 0

Henri Verbeet : wined3d: Add a debug function for state names.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 9bbccb7f8070d0bf3c725e3074d4d00b8bb450bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbccb7f8070d0bf3c725e307… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:23 2010 +0100 wined3d: Add a debug function for state names. --- dlls/wined3d/utils.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4038833..b92b884 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1786,6 +1786,51 @@ const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) { } } +const char *debug_d3dstate(DWORD state) +{ + if (STATE_IS_RENDER(state)) + return wine_dbg_sprintf("STATE_RENDER(%s)", debug_d3drenderstate(state - STATE_RENDER(0))); + if (STATE_IS_TEXTURESTAGE(state)) + { + DWORD texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + DWORD texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); + return wine_dbg_sprintf("STATE_TEXTURESTAGE(%#x, %s)", + texture_stage, debug_d3dtexturestate(texture_state)); + } + if (STATE_IS_SAMPLER(state)) + return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); + if (STATE_IS_PIXELSHADER(state)) + return "STATE_PIXELSHADER"; + if (STATE_IS_TRANSFORM(state)) + return wine_dbg_sprintf("STATE_TRANSFORM(%s)", debug_d3dtstype(state - STATE_TRANSFORM(0))); + if (STATE_IS_STREAMSRC(state)) + return "STATE_STREAMSRC"; + if (STATE_IS_INDEXBUFFER(state)) + return "STATE_INDEXBUFFER"; + if (STATE_IS_VDECL(state)) + return "STATE_VDECL"; + if (STATE_IS_VSHADER(state)) + return "STATE_VSHADER"; + if (STATE_IS_VIEWPORT(state)) + return "STATE_VIEWPORT"; + if (STATE_IS_VERTEXSHADERCONSTANT(state)) + return "STATE_VERTEXSHADERCONSTANT"; + if (STATE_IS_PIXELSHADERCONSTANT(state)) + return "STATE_PIXELSHADERCONSTANT"; + if (STATE_IS_ACTIVELIGHT(state)) + return wine_dbg_sprintf("STATE_ACTIVELIGHT(%#x)", state - STATE_ACTIVELIGHT(0)); + if (STATE_IS_SCISSORRECT(state)) + return "STATE_SCISSORRECT"; + if (STATE_IS_CLIPPLANE(state)) + return wine_dbg_sprintf("STATE_CLIPPLANE(%#x)", state - STATE_CLIPPLANE(0)); + if (STATE_IS_MATERIAL(state)) + return "STATE_MATERIAL"; + if (STATE_IS_FRONTFACE(state)) + return "STATE_FRONTFACE"; + + return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); +} + const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { #define POOL_TO_STR(p) case p: return #p diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164cc6b..c5713c0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -994,8 +994,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) +#define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) #define STATE_FRONTFACE (STATE_MATERIAL + 1) +#define STATE_IS_FRONTFACE(a) ((a) == STATE_FRONTFACE) #define STATE_HIGHEST (STATE_FRONTFACE) @@ -2506,6 +2508,7 @@ const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) DECLSPEC_HIDDEN;

1 0

Igor Paliychuk : xcopy.exe: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 3df59ccf69293d5f0ddf116eb0aa7e3c94dea0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df59ccf69293d5f0ddf116eb… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:13:37 2010 +0200 xcopy.exe: Add Ukrainian translations. --- programs/xcopy/Makefile.in | 3 +- programs/xcopy/Uk.rc | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 088db0e..7c626d5 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -25,7 +25,8 @@ RC_SRCS = \ Pl.rc \ Pt.rc \ Ru.rc \ - Si.rc + Si.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/xcopy/Uk.rc b/programs/xcopy/Uk.rc new file mode 100644 index 0000000..6d59e1b --- /dev/null +++ b/programs/xcopy/Uk.rc @@ -0,0 +1,84 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Ukrainian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2010 I. Paliychuk + * + * 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 "xcopy.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Невірна кількість параметрів - Введіть xcopy /? для довідки\n" + STRING_INVPARM, "Невірний параметр '%s' - Введіть xcopy /? для довідки\n" + STRING_PAUSE, "Натисніть <enter> щоб почати копіювання\n" + STRING_SIMCOPY, "%d файл(ів) буде скопійовано\n" + STRING_COPY, "%d файл(ів) скопійовано\n" + STRING_QISDIR, "'%s' є файлом чи директорією\n" \ + "on the target?\n" \ + "(F - Файл, D - Директорія)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n" + STRING_COPYFAIL, "Під час копіювання '%s' в '%s' сталась помилка r/c %d\n" + STRING_OPENFAIL, "Не вдалось відкрити '%s'\n" + STRING_READFAIL, "Помилка читання '%s'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Копіює файли та дерева директорій за призначенням\n\ +\n\ +Syntax:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or\n\ +\tmore files\n\ +[/S] Копіює директорії та піддиректорії\n\ +[/E] Копіює директорії та піддиректорії, включно з порожніми\n\ +[/Q] Do not list names during copy, ie quiet.\n\ +[/F] Під час копіювання відображає повні імена початкових і кінцевих файлів\n\ +[/L] Simulate operation, showing names which would be copied\n\ +[/W] Питає підтвердження перед початком копіювання\n\ +[/T] Створює структуру каталогів але не копіює файли\n\ +[/Y] Suppress prompting when overwriting files\n\ +[/-Y] Питає підтвердження на перезапис файлів\n\ +[/P] Prompts on each source file before copying\n\ +[/N] Копіює, використовуючи короткі імена\n\ +[/U] Copy only files which already exist in destination\n\ +[/R] Перезаписує файли, доступні лише для читання\n\ +[/H] Include hidden and system files in the copy\n\ +[/C] Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\ +[/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ +[/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ +\властивість АРХІВНИЙ\n\ +[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\ +\t\tЯкщо дата не вказана, only copy if destination is older\n\ +\t\tthan source\n\n" + +}

1 0

Igor Paliychuk : write.exe: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: d05656f373ce8be1b2612e6dc07b228ce36783c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05656f373ce8be1b2612e6dc… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:10:04 2010 +0200 write.exe: Add Ukrainian translations. --- programs/write/Makefile.in | 3 ++- programs/write/Uk.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index be459b6..7329856 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -23,7 +23,8 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ - Sv.rc + Sv.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/write/Uk.rc b/programs/write/Uk.rc new file mode 100644 index 0000000..f922210 --- /dev/null +++ b/programs/write/Uk.rc @@ -0,0 +1,33 @@ +/* + * Ukrainian language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * Copyright (C) 2010 Igor Paliychuk + * + * 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 "resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Не вдалось запустити Wordpad" +}

1 0

Igor Paliychuk : wordpad: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 05450498d01b8280ae2cbf5ab759591dfbb7c6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=05450498d01b8280ae2cbf5ab… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:09:32 2010 +0200 wordpad: Add Ukrainian translations. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/Uk.rc | 250 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05450498d01b8280ae2cb…

1 0

Igor Paliychuk : wldap32: Add Ukrainian translations.
by Alexandre Julliard 29 Jan '10

29 Jan '10

Module: wine Branch: master Commit: 8777a2cf6e62db815d6c87303daca3f08bffc7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8777a2cf6e62db815d6c87303… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:07:17 2010 +0200 wldap32: Add Ukrainian translations. --- dlls/wldap32/Makefile.in | 3 +- dlls/wldap32/wldap32_Uk.rc | 130 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 5b1776e..59f4214 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -43,7 +43,8 @@ RC_SRCS = \ wldap32_Pt.rc \ wldap32_Ru.rc \ wldap32_Sv.rc \ - wldap32_Tr.rc + wldap32_Tr.rc \ + wldap32_Uk.rc @MAKE_DLL_RULES@ diff --git a/dlls/wldap32/wldap32_Uk.rc b/dlls/wldap32/wldap32_Uk.rc new file mode 100644 index 0000000..54fe943 --- /dev/null +++ b/dlls/wldap32/wldap32_Uk.rc @@ -0,0 +1,130 @@ +/* + * Ukrainian resources for WLDAP32 + * + * Copyright 2005 Hans Leidekker + * + * Copyright 2010 Igor Paliychuk + * + * 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 "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "Успіх" + 1 "Помилка операції" + 2 "Помилка протоколу" + 3 "Перевищено обмеження в часі" + 4 "Перевищено обмеження в розмірі" + 5 "Порівняння невірне" + 6 "Порівняння вірне" + 7 "Метод авторизації не підтримується" + 8 "Потрібна тверда авторизація" + 9 "Referral (v2)" + 10 "Referral" + 11 "Перевищено обмеження адміністрування" + 12 "Unavailable Critical Extension" + 13 "Потрібна конфіденційність" + 14 "" + 15 "" + 16 "Немає такої властивості" + 17 "Невизначений тип" + 18 "Inappropriate Matching" + 19 "Constraint Violation" + 20 "Всастивість або значення існує" + 21 "Неправильний синтакс" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Немає такого об'єкту" + 33 "Проблема з псевдонімом" + 34 "Невірний DN синтаксис" + 35 "Це лист дерева" + 36 "Проблема звернення до псевдоніму" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Inappropriate Authentication" + 49 "Невірні облікові дані" + 50 "Недостатньо прав" + 51 "Зайнято" + 52 "Недоступно" + 53 "Unwilling To Perform" + 54 "Виявлено зациклювання" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Відсутнє управління сортуванням" + 61 "Помилка діапазону індексу" + 62 "" + 63 "" + 64 "Порушення прав найменування" + 65 "Порушення класу об'єкту" + 66 "Не дозволено не налисті дерева" + 67 "Не дозволено на RDN" + 68 "Вже існує" + 69 "Немає режимів класу об'єкту" + 70 "Результати завеликі" + 71 "Впливає на декілька DSA" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Інший" + 81 "Сервер недоступний" + 82 "Локальна помилка" + 83 "Помилка кодування" + 84 "Помилка декодування" + 85 "Timeout" + 86 "Auth Unknown" + 87 "Помилка фільтру" + 88 "Відмінено користувачем" + 89 "Помилка параметра" + 90 "Немає пам'яті" + 91 "Неможливо підключитись до LDAP сервера" + 92 "Операція не підтримується цією версією протоколу LDAP" + 93 "Вказаний елемент керування не знайдено в повідомленні" + 94 "В повідомленні немає результату" + 95 "More results returned" + 96 "Loop while handling referrals" + 97 "Referral hop limit exceeded" +}

1 0

← Newer
1
2
3
4
5
6
7
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010