November 2012 - Wine-Commits

Dmitry Timoshkov : gdiplus: Allocate a copy of the graphics transformation matrix on the stack instead of cloning it .
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: fa184bc2c2ff2b597c797c69bdea1980355df5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa184bc2c2ff2b597c797c69b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:39:18 2012 +0800 gdiplus: Allocate a copy of the graphics transformation matrix on the stack instead of cloning it. --- dlls/gdiplus/graphics.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e7b72b7..f364a64 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -312,7 +312,7 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GpPointF *ptf, INT count) { REAL scale_x, scale_y; - GpMatrix *matrix; + GpMatrix matrix; int i; scale_x = units_to_pixels(1.0, graphics->unit, graphics->xres); @@ -325,10 +325,9 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, scale_y *= graphics->scale; } - GdipCloneMatrix(graphics->worldtrans, &matrix); - GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); - GdipTransformMatrixPoints(matrix, ptf, count); - GdipDeleteMatrix(matrix); + matrix = *graphics->worldtrans; + GdipScaleMatrix(&matrix, scale_x, scale_y, MatrixOrderAppend); + GdipTransformMatrixPoints(&matrix, ptf, count); for(i = 0; i < count; i++){ pti[i].x = gdip_round(ptf[i].X);

1 0

Jason Edmeades : attrib: Add attrib /d support.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: f2699f9f6007ecaf019ec456fc09e274e3f136b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2699f9f6007ecaf019ec456f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:25:30 2012 +0100 attrib: Add attrib /d support. --- programs/attrib/attrib.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index bce9c06..e2cec36 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -132,13 +132,15 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) * filespec [I] The filespec to search for * recurse [I] Whether to recurse (search subdirectories before * current directory) + * includedirs [I] Whether to set directory attributes as well * attrib_set [I] Attributes to set * attrib_clear [I] Attributes to clear * * Returns TRUE if at least one file displayed / modified * ========================================================================= */ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, - BOOL recurse, DWORD attrib_set, DWORD attrib_clear) + BOOL recurse, BOOL includedirs, + DWORD attrib_set, DWORD attrib_clear) { BOOL found = FALSE; WCHAR buffer[MAX_PATH]; @@ -174,7 +176,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, strcpyW(buffer, rootdir); strcatW(buffer, fd.cFileName); strcatW(buffer, slashW); - ATTRIB_processdirectory(buffer, filespec, recurse, attrib_set, attrib_clear); + ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, + attrib_set, attrib_clear); } while (FindNextFileW(hff, &fd) != 0); } @@ -198,6 +201,9 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) continue; + if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (attrib_set || attrib_clear) { fd.dwFileAttributes &= ~attrib_clear; fd.dwFileAttributes |= attrib_set; @@ -248,7 +254,9 @@ int wmain(int argc, WCHAR *argv[]) DWORD attrib_set = 0; DWORD attrib_clear = 0; BOOL attrib_recurse = 0; - const WCHAR help_option[] = {'/','?','\0'}; + BOOL attrib_includedirs = FALSE; + static const WCHAR help_option[] = {'/','?','\0'}; + static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; @@ -280,7 +288,7 @@ int wmain(int argc, WCHAR *argv[]) } } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { - WINE_FIXME("Option /D not yet supported\n"); + attrib_includedirs = TRUE; } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { @@ -305,9 +313,13 @@ int wmain(int argc, WCHAR *argv[]) name[0] = 0; } + /* If a directory is explicitly supplied on the command line, and no + wildcards are in the name, then allow it to be changed/displayed */ + if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, - attrib_set, attrib_clear); + attrib_includedirs, attrib_set, attrib_clear); if (!found) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), originalname); }

1 0

Jason Edmeades : attrib: Add support for attrib /s.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: e26c2a5691bdc86156ee4768ae121e79cc05802f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26c2a5691bdc86156ee4768a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:22:56 2012 +0100 attrib: Add support for attrib /s. --- programs/attrib/attrib.c | 191 +++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- 2 files changed, 136 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26c2a5691bdc86156ee4…

1 0

Jacek Caban : mshtml: Keep reference to document node in fire_event_obj.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: e3e0fdd4612a690b556b6b203870410eaa9c3967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e0fdd4612a690b556b6b203… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 19:04:30 2012 +0100 mshtml: Keep reference to document node in fire_event_obj. --- dlls/mshtml/htmlevent.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cb8a1cf..13095fb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1055,6 +1055,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); + htmldoc_addref(&doc->basedoc); + window = doc->window; prev_event = window->event; window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; @@ -1155,6 +1157,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("calling PreventDefault\n"); nsIDOMEvent_PreventDefault(event_obj->nsevent); } + + htmldoc_release(&doc->basedoc); } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent,

1 0

Henri Verbeet : wined3d: Use the shader object ids as program key.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: b8bb2a4f85b0e36a033a0964a59080c2ec1e9592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bb2a4f85b0e36a033a0964a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:24 2012 +0100 wined3d: Use the shader object ids as program key. --- dlls/wined3d/glsl_shader.c | 114 +++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8bb2a4f85b0e36a033a0…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for the vs specific fields in struct glsl_shader_prog_link .
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: ffd5e3eb81193c1b9dbfe7be19faf25eccbb0e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd5e3eb81193c1b9dbfe7be1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:25 2012 +0100 wined3d: Introduce a separate structure for the vs specific fields in struct glsl_shader_prog_link. --- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 75fb7e4..192eba3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -100,24 +100,30 @@ struct shader_glsl_priv { const struct fragment_pipeline *fragment_pipe; }; +struct glsl_vs_program +{ + struct list shader_entry; + GLhandleARB id; + GLenum vertex_color_clamp; + GLint *uniform_f_locations; + GLint uniform_i_locations[MAX_CONST_I]; + GLint pos_fixup_location; +}; + /* Struct to maintain data about a linked GLSL program */ -struct glsl_shader_prog_link { - struct wine_rb_entry program_lookup_entry; - struct list vshader_entry; +struct glsl_shader_prog_link +{ + struct wine_rb_entry program_lookup_entry; + struct glsl_vs_program vs; struct list pshader_entry; GLhandleARB programId; - GLint *vuniformF_locations; GLint *puniformF_locations; - GLint vuniformI_locations[MAX_CONST_I]; GLint puniformI_locations[MAX_CONST_I]; - GLint posFixup_location; GLint np2Fixup_location; GLint bumpenvmat_location[MAX_TEXTURES]; GLint luminancescale_location[MAX_TEXTURES]; GLint luminanceoffset_location[MAX_TEXTURES]; GLint ycorrection_location; - GLenum vertex_color_clamp; - GLhandleARB vs_id; GLhandleARB ps_id; UINT constant_version; const struct ps_np2fixup_info *np2Fixup_info; @@ -737,10 +743,10 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Load DirectX 9 float constants/uniforms for vertex shader */ shader_glsl_load_constantsF(vshader, gl_info, state->vs_consts_f, - prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); + prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, state->vs_consts_i, + shader_glsl_load_constantsI(vshader, gl_info, prog->vs.uniform_i_locations, state->vs_consts_i, stateBlock->changed.vertexShaderConstantsI & vshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ @@ -749,7 +755,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Upload the position fixup params */ shader_get_position_fixup(context, state, position_fixup); - GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, position_fixup)); + GL_EXTCALL(glUniform4fvARB(prog->vs.pos_fixup_location, 1, position_fixup)); checkGLcall("glUniform4fvARB"); } @@ -4100,7 +4106,7 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh { struct glsl_program_key key; - key.vs_id = entry->vs_id; + key.vs_id = entry->vs.id; key.ps_id = entry->ps_id; if (wine_rb_put(&priv->program_lookup, &key, &entry->program_lookup_entry) == -1) @@ -4128,16 +4134,16 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc { struct glsl_program_key key; - key.vs_id = entry->vs_id; + key.vs_id = entry->vs.id; key.ps_id = entry->ps_id; wine_rb_remove(&priv->program_lookup, &key); GL_EXTCALL(glDeleteObjectARB(entry->programId)); - if (entry->vs_id) - list_remove(&entry->vshader_entry); + if (entry->vs.id) + list_remove(&entry->vs.shader_entry); if (entry->ps_id) list_remove(&entry->pshader_entry); - HeapFree(GetProcessHeap(), 0, entry->vuniformF_locations); + HeapFree(GetProcessHeap(), 0, entry->vs.uniform_f_locations); HeapFree(GetProcessHeap(), 0, entry->puniformF_locations); HeapFree(GetProcessHeap(), 0, entry); } @@ -4744,7 +4750,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Create the entry */ entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; - entry->vs_id = vs_id; + entry->vs.id = vs_id; entry->ps_id = ps_id; entry->constant_version = 0; entry->np2Fixup_info = np2fixup_info; @@ -4791,7 +4797,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } checkGLcall("glBindAttribLocationARB"); - list_add_head(&vshader->linked_programs, &entry->vshader_entry); + list_add_head(&vshader->linked_programs, &entry->vs.shader_entry); } /* Attach GLSL pshader */ @@ -4809,17 +4815,17 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, + entry->vs.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) { snprintf(glsl_name, sizeof(glsl_name), "vs_c[%u]", i); - entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + entry->vs.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } for (i = 0; i < MAX_CONST_I; ++i) { snprintf(glsl_name, sizeof(glsl_name), "vs_i[%u]", i); - entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + entry->vs.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); @@ -4855,7 +4861,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } } - entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); + entry->vs.pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); checkGLcall("Find glsl program uniform locations"); @@ -4863,9 +4869,11 @@ static void set_glsl_shader_program(const struct wined3d_context *context, && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) { TRACE("Shader %d needs vertex color clamping disabled\n", programId); - entry->vertex_color_clamp = GL_FALSE; - } else { - entry->vertex_color_clamp = GL_FIXED_ONLY_ARB; + entry->vs.vertex_color_clamp = GL_FALSE; + } + else + { + entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; } /* Set the shader to allow uniform loading on it */ @@ -5015,13 +5023,13 @@ static void shader_glsl_select(const struct wined3d_context *context, enum wined BOOL useVS = vertex_mode == WINED3D_SHADER_MODE_SHADER; BOOL usePS = fragment_mode == WINED3D_SHADER_MODE_SHADER; - old_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + old_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vs.vertex_color_clamp : GL_FIXED_ONLY_ARB; priv->fragment_pipe->enable_extension(gl_info, fragment_mode == WINED3D_SHADER_MODE_FFP); if (useVS || usePS) set_glsl_shader_program(context, device, usePS, useVS); else priv->glsl_program = NULL; - current_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + current_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vs.vertex_color_clamp : GL_FIXED_ONLY_ARB; if (old_vertex_color_clamp != current_vertex_color_clamp) { @@ -5150,7 +5158,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) struct glsl_vs_compiled_shader *gl_shaders = shader_data->gl_shaders.vs; LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, - struct glsl_shader_prog_link, vshader_entry) + struct glsl_shader_prog_link, vs.shader_entry) { delete_glsl_program_entry(priv, gl_info, entry); } @@ -5158,7 +5166,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) for (i = 0; i < shader_data->num_gl_shaders; ++i) { TRACE("Deleting vertex shader %u.\n", gl_shaders[i].prgId); - if (priv->glsl_program && priv->glsl_program->vs_id == gl_shaders[i].prgId) + if (priv->glsl_program && priv->glsl_program->vs.id == gl_shaders[i].prgId) shader_glsl_select(context, WINED3D_SHADER_MODE_NONE, WINED3D_SHADER_MODE_NONE); GL_EXTCALL(glDeleteObjectARB(gl_shaders[i].prgId)); checkGLcall("glDeleteObjectARB"); @@ -5188,8 +5196,8 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); - if (k->vs_id > prog->vs_id) return 1; - else if (k->vs_id < prog->vs_id) return -1; + if (k->vs_id > prog->vs.id) return 1; + else if (k->vs_id < prog->vs.id) return -1; if (k->ps_id > prog->ps_id) return 1; else if (k->ps_id < prog->ps_id) return -1;

1 0

Detlef Riekenberg : schtasks: Add a stub schtasks.exe.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 37035e53cd0f4dec9b89ffbee87f480abaae25c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37035e53cd0f4dec9b89ffbee… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:02:06 2012 +0100 schtasks: Add a stub schtasks.exe. --- configure | 1 + configure.ac | 1 + programs/schtasks/Makefile.in | 7 +++++++ programs/schtasks/schtasks.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3cd967c..bc31918 100755 --- a/configure +++ b/configure @@ -15933,6 +15933,7 @@ wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install +wine_fn_config_program schtasks enable_schtasks install wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services install diff --git a/configure.ac b/configure.ac index d527c73..1adb6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_PROGRAM(rpcss,,[install]) WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) WINE_CONFIG_PROGRAM(sc,,[install]) +WINE_CONFIG_PROGRAM(schtasks,,[install]) WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[install]) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in new file mode 100644 index 0000000..e1747eb --- /dev/null +++ b/programs/schtasks/Makefile.in @@ -0,0 +1,7 @@ +MODULE = schtasks.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + schtasks.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c new file mode 100644 index 0000000..a3af346 --- /dev/null +++ b/programs/schtasks/schtasks.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schtasks); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jason Edmeades : cmd: Don' t overflow parameter length when copying substring.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 7c3f3d09dd589430060f3f0bee6d813e213c65f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3f3d09dd589430060f3f0be… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 21:17:13 2012 +0100 cmd: Don't overflow parameter length when copying substring. --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index aeaa14d..8a7e3fa 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -275,7 +275,7 @@ P0S q qwe er -(a)todo_wine@'ty'@or_broken@'' +'ty'@or_broken@'' 't'@or_broken@'' ert(a)or_broken@qwerty e(a)or_broken@qwerty diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 89c1327..534e5a6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -730,6 +730,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, else if (copybytes < 0) copybytes = 0; WCMD_strsubstW(start, endOfVar + 1, startCopy, copybytes); } else { + substrlength = min(substrlength, len - (startCopy- thisVarContents + 1)); WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); }

1 0

Jason Edmeades : attrib: Support relative paths as args.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 8e575940ad81688fe8cffc500f256a18ab8630c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e575940ad81688fe8cffc500… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 22:42:46 2012 +0100 attrib: Support relative paths as args. --- programs/attrib/attrib.c | 19 ++++++++++++++----- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index ca15980..25117cc 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -129,11 +129,11 @@ int wmain(int argc, WCHAR *argv[]) WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[MAX_PATH]; + WCHAR *namepart; WCHAR curdir[MAX_PATH]; DWORD attrib_set = 0; DWORD attrib_clear = 0; const WCHAR help_option[] = {'/','?','\0'}; - const WCHAR slash[] = {'\\','\0'}; const WCHAR start[] = {'*','\0'}; int i = 1; @@ -143,13 +143,11 @@ int wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); - strcatW(curdir, slash); - strcpyW(name, curdir); - strcatW(name, start); + strcpyW(name, start); while (i < argc) { WCHAR *param = argv[i++]; + WINE_TRACE("Processing arg: '%s'\n", wine_dbgstr_w(param)); if ((param[0] == '+') || (param[0] == '-')) { DWORD attrib = 0; switch (param[1]) { @@ -178,6 +176,15 @@ int wmain(int argc, WCHAR *argv[]) } } + /* Name may be a relative or explicit path, so calculate curdir based on + current locations, stripping off the filename */ + WINE_TRACE("Supplied name: '%s'\n", wine_dbgstr_w(name)); + GetFullPathNameW(name, sizeof(curdir)/sizeof(WCHAR), curdir, &namepart); + WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); + strcpyW(name, curdir); + if (namepart) *namepart = 0x00; + + /* Search for files based on the location and filespec supplied */ hff = FindFirstFileW(name, &fd); if (hff == INVALID_HANDLE_VALUE) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), name); @@ -195,6 +202,8 @@ int wmain(int argc, WCHAR *argv[]) fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; + strcpyW(name, curdir); + strcatW(name, fd.cFileName); SetFileAttributesW(name, fd.dwFileAttributes); } else { static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8a7e3fa..42f578d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -959,14 +959,14 @@ foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 +A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 @todo_wine(a)A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 @todo_wine(a)A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar --- folders processing @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz -(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto +A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto toto lulu file created in read-only dir

1 0

Jason Edmeades : xcopy: Fix resource leak (coverity).
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 4a1349023743b42fda02e96cdc0a6c5f4d716581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1349023743b42fda02e96cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:53:39 2012 +0000 xcopy: Fix resource leak (coverity). --- programs/xcopy/xcopy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cec0828..ffd2c56 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -627,6 +627,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Find next one */ findres = FindNextFileW(h, finddata); } + FindClose(h); } cleanup:

1 0