August 2011 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Implement Multiple Substitution Subtable.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: fda05436d11c687273b731e8f8d35424ef0e3125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda05436d11c687273b731e8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 22 07:18:09 2011 -0500 usp10: Implement Multiple Substitution Subtable. --- dlls/usp10/shape.c | 118 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 99 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index aacb998..0068b41 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -203,6 +203,18 @@ typedef struct { typedef struct { WORD SubstFormat; /* = 1 */ WORD Coverage; + WORD SequenceCount; + WORD Sequence[1]; +}GSUB_MultipleSubstFormat1; + +typedef struct { + WORD GlyphCount; + WORD Substitute[1]; +}GSUB_Sequence; + +typedef struct { + WORD SubstFormat; /* = 1 */ + WORD Coverage; WORD LigSetCount; WORD LigatureSet[1]; }GSUB_LigatureSubstFormat1; @@ -733,6 +745,54 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN return GSUB_E_NOGLYPH; } +static INT GSUB_apply_MultipleSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Multiple Substitution Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset, index; + const GSUB_MultipleSubstFormat1 *msf1; + offset = GET_BE_WORD(look->SubTable[j]); + msf1 = (const GSUB_MultipleSubstFormat1*)((const BYTE*)look+offset); + + offset = GET_BE_WORD(msf1->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)msf1+offset, glyphs[glyph_index]); + if (index != -1) + { + const GSUB_Sequence *seq; + int sub_count; + int j; + offset = GET_BE_WORD(msf1->Sequence[index]); + seq = (const GSUB_Sequence*)((const BYTE*)msf1+offset); + sub_count = GET_BE_WORD(seq->GlyphCount); + TRACE(" Glyph 0x%x (+%i)->",glyphs[glyph_index],(sub_count-1)); + + for (j = (*glyph_count)+(sub_count-1); j > glyph_index; j--) + glyphs[j] =glyphs[j-(sub_count-1)]; + + for (j = 0; j < sub_count; j++) + if (write_dir < 0) + glyphs[glyph_index + (sub_count-1) - j] = GET_BE_WORD(seq->Substitute[j]); + else + glyphs[glyph_index + j] = GET_BE_WORD(seq->Substitute[j]); + + *glyph_count = *glyph_count + (sub_count - 1); + + if (TRACE_ON(uniscribe)) + { + for (j = 0; j < sub_count; j++) + TRACE(" 0x%x",glyphs[glyph_index+j]); + TRACE("\n"); + } + + return glyph_index + sub_count; + } + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -943,6 +1003,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 2: + return GSUB_apply_MultipleSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 3: return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: @@ -1261,28 +1323,41 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch { int i; int target_glyph = nextIndex - 1; + int seeking_glyph; int target_index = -1; int replacing_glyph = -1; int changed = 0; - if (write_dir > 0) - for (i = 0; i < chars; i++) - { - if (pwLogClust[i] == target_glyph) + + if (changeCount > 0) + target_glyph = nextIndex - (changeCount+1); + + seeking_glyph = target_glyph; + + do { + if (write_dir > 0) + for (i = 0; i < chars; i++) { - target_index = i; - break; + if (pwLogClust[i] == seeking_glyph) + { + target_index = i; + break; + } } - } - else - for (i = chars - 1; i >= 0; i--) - { - if (pwLogClust[i] == target_glyph) + else + for (i = chars - 1; i >= 0; i--) { - target_index = i; - break; + if (pwLogClust[i] == seeking_glyph) + { + target_index = i; + break; + } } - } + if (target_index == -1) + seeking_glyph ++; + } + while (target_index == -1 && seeking_glyph < chars); + if (target_index == -1) { ERR("Unable to find target glyph\n"); @@ -1310,13 +1385,18 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch break; } } - } - /* renumber trailing indexes*/ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + /* renumber trailing indexes*/ + for(i = target_index; i < chars && i >= 0; i+=write_dir) + { + if (pwLogClust[i] != target_glyph) + pwLogClust[i] += changeCount; + } + } + else { - if (pwLogClust[i] != target_glyph) - pwLogClust[i] += changeCount; + for(i = target_index; i < chars && i >= 0; i+=write_dir) + pwLogClust[i] += changeCount; } } }

1 0

Henri Verbeet : wined3d: Reject color blits on sysmem surfaces in arbfp_blit_supported().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: c592d553f087a3713216a32880405a1a0143504d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c592d553f087a3713216a3288… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:41 2011 +0200 wined3d: Reject color blits on sysmem surfaces in arbfp_blit_supported(). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d4a850b..24c0ff2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7166,6 +7166,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win return FALSE; } + if (src_pool == WINED3DPOOL_SYSTEMMEM || dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + src_fixup = get_complex_fixup(src_format->color_fixup); if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) {

1 0

Henri Verbeet : wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: f58e55ec6c19d65689b273938f168287797362da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58e55ec6c19d65689b273938… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:42 2011 +0200 wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2fc08d8..04a6dec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1682,6 +1682,16 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); return WINED3D_OK; } + + if (arbfp_blit.blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + TRACE("Using arbfp blit.\n"); + + if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect))) + return WINED3D_OK; + } } } @@ -5504,14 +5514,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!(flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && arbfp_blit.blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - src_rect, src_surface->resource.usage, src_surface->resource.pool, - src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, - dst_surface->resource.format)) - return arbfp_blit_surface(device, Filter, src_surface, src_rect, dst_surface, dst_rect); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))

1 0

Henri Verbeet : wined3d: Reject color blits on sysmem surfaces in ffp_blit_supported().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 48911d7a1c64ff735a791ac1f59429a5aebcd7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=48911d7a1c64ff735a791ac1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:43 2011 +0200 wined3d: Reject color blits on sysmem surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04a6dec..1cafe03 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6325,6 +6325,9 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: + if (src_pool == WINED3DPOOL_SYSTEMMEM || dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + src_fixup = get_complex_fixup(src_format->color_fixup); if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) {

1 0

Henri Verbeet : wined3d: Rename WineD3D_ChoosePixelFormat() to context_choose_pixel_format().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 9df014b9de29c26bca0b42c78b6f10bb45cd5073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df014b9de29c26bca0b42c78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:44 2011 +0200 wined3d: Rename WineD3D_ChoosePixelFormat() to context_choose_pixel_format(). --- dlls/wined3d/context.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 53aeca3..9a67536 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1053,8 +1053,8 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state) context->isStateDirty[idx] |= (1 << shift); } -/* This function takes care of WineD3D pixel format selection. */ -static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, +/* This function takes care of wined3d pixel format selection. */ +static int context_choose_pixel_format(struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, BOOL auxBuffers, int numSamples, BOOL findCompatible) { @@ -1290,14 +1290,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - pixel_format = WineD3D_ChoosePixelFormat(device, hdc, color_format, ds_format, + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, numSamples, FALSE /* findCompatible */); /* Try to locate a compatible format if we weren't able to find anything. */ if (!pixel_format) { TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); - pixel_format = WineD3D_ChoosePixelFormat(device, hdc, color_format, ds_format, + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, 0 /* numSamples */, TRUE /* findCompatible */); }

1 0

Frédéric Delanoy : cmd: Rename WCMD_strtrim_leading_spaces to WCMD_skip_leading_spaces to better reflect its purpose .
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: bb47576f59260a3f13894eec311c78d3fb046876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb47576f59260a3f13894eec3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:58 2011 +0200 cmd: Rename WCMD_strtrim_leading_spaces to WCMD_skip_leading_spaces to better reflect its purpose. --- programs/cmd/builtins.c | 14 +++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e738626..0e95cc3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -186,11 +186,11 @@ void WCMD_choice (WCHAR * command) { have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); errorlevel = 0; - my_command = WCMD_strdupW(WCMD_strtrim_leading_spaces(command)); + my_command = WCMD_strdupW(WCMD_skip_leading_spaces(command)); if (!my_command) return; - ptr = WCMD_strtrim_leading_spaces(my_command); + ptr = WCMD_skip_leading_spaces(my_command); while (*ptr == '/') { switch (toupperW(ptr[1])) { case 'C': @@ -213,19 +213,19 @@ void WCMD_choice (WCHAR * command) { if (*ptr) { /* terminate allowed chars */ *ptr = 0; - ptr = WCMD_strtrim_leading_spaces(&ptr[1]); + ptr = WCMD_skip_leading_spaces(&ptr[1]); } WINE_TRACE("answer-list: %s\n", wine_dbgstr_w(opt_c)); break; case 'N': opt_n = TRUE; - ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + ptr = WCMD_skip_leading_spaces(&ptr[2]); break; case 'S': opt_s = TRUE; - ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + ptr = WCMD_skip_leading_spaces(&ptr[2]); break; case 'T': @@ -252,7 +252,7 @@ void WCMD_choice (WCHAR * command) { answer[count] = 0; opt_timeout = atoiW(answer); - ptr = WCMD_strtrim_leading_spaces(ptr); + ptr = WCMD_skip_leading_spaces(ptr); break; default: @@ -1315,7 +1315,7 @@ void WCMD_give_help (WCHAR *command) { int i; - command = WCMD_strtrim_leading_spaces(command); + command = WCMD_skip_leading_spaces(command); if (strlenW(command) == 0) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0c7f622..1104d8e 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -96,7 +96,7 @@ int WCMD_volume (int mode, WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where); -WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); +WCHAR *WCMD_skip_leading_spaces (WCHAR *string); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2018a12..c23fefd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -441,12 +441,12 @@ void WCMD_strsubstW(WCHAR* start, WCHAR* next, WCHAR* insert, int len) { } /*************************************************************************** - * WCMD_strtrim_leading_spaces + * WCMD_skip_leading_spaces * - * Remove leading spaces from a string. Return a pointer to the first - * non-space character. Does not modify the input string + * Return a pointer to the first non-space character of string. + * Does not modify the input string. */ -WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string) { +WCHAR *WCMD_skip_leading_spaces (WCHAR *string) { WCHAR *ptr; @@ -1392,7 +1392,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, /* * Strip leading whitespaces, and a '@' if supplied */ - whichcmd = WCMD_strtrim_leading_spaces(cmd); + whichcmd = WCMD_skip_leading_spaces(cmd); WINE_TRACE("Command: '%s'\n", wine_dbgstr_w(cmd)); if (whichcmd[0] == '@') whichcmd++; @@ -1409,7 +1409,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break; } - p = WCMD_strtrim_leading_spaces (&whichcmd[count]); + p = WCMD_skip_leading_spaces (&whichcmd[count]); WCMD_parse (p, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2));

1 0

Frédéric Delanoy : cmd: Constify some function parameters.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: ff501904a7a19082f68e36831e620233a74884c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff501904a7a19082f68e36831… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:59 2011 +0200 cmd: Constify some function parameters. --- programs/cmd/batch.c | 3 ++- programs/cmd/builtins.c | 39 +++++++++++++++++++++------------------ programs/cmd/tests/batch.c | 2 +- programs/cmd/wcmd.h | 34 ++++++++++++++++++---------------- programs/cmd/wcmdmain.c | 22 ++++++++++++---------- 5 files changed, 54 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff501904a7a19082f68e3…

1 0

Frédéric Delanoy : cmd/tests: Add basic cd tests.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 6bd0671f074cb643a1072625bae572d4a6bb9331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd0671f074cb643a1072625b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:59:00 2011 +0200 cmd/tests: Add basic cd tests. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 ++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ffbc814..c640ec4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -244,6 +244,38 @@ if exist bar6 ( del bar6 ) +echo ------------ Testing cd ------------ +mkdir foobar +cd foobar +echo blabla > singleFile +dir /b +echo Current dir: %CD% +cd +cd .. +cd +cd foobar(a)space@ +cd +cd .. +cd +cd @space(a)foobar +cd +cd.. +cd +cd foobar +cd..(a)space@ +cd +if not exist foobar (cd ..) +cd foobar +mkdir "bar bak" +cd "bar bak" +cd +cd .. +cd bar bak +cd +cd ..\.. +cd +rd /Q/s foobar + echo ------------ Testing type ------------ echo bar> foobaz @echo on diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2954e16..1580637 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -179,6 +179,19 @@ foo4 @todo_wine(a)...on failure conditional || @todo_wine(a)foo5 @todo_wine(a)foo6@space@ +------------ Testing cd ------------ +singleFile +Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar +(a)pwd@ +(a)todo_wine@@pwd@ +(a)pwd@\foobar\bar bak +(a)pwd@\foobar\bar bak +(a)pwd@ ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : cmd/tests: Add @tab@ keyword recognition.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 453996fe85582b67659a03a9a5ff4ac36c618786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453996fe85582b67659a03a9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:59:01 2011 +0200 cmd/tests: Add @tab@ keyword recognition. --- programs/cmd/tests/batch.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 0e7ca65..cb3d972 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,10 +25,11 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; -/* Convert to DOS line endings, and substitute escaped spaces with real ones */ +/* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) { static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + static const char escaped_tab[] = {'@','t','a','b','@'}; DWORD i, eol_count = 0; char *ptr, *new_data; @@ -48,6 +49,10 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { *ptr++ = ' '; i += sizeof(escaped_space) - 1; + } else if (data + i + sizeof(escaped_tab) - 1 < data + size + && !memcmp(data + i, escaped_tab, sizeof(escaped_tab))) { + *ptr++ = '\t'; + i += sizeof(escaped_tab) - 1; } else { *ptr++ = data[i]; } @@ -150,6 +155,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; + static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { @@ -174,7 +180,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const } else { err = out_end; } - + }else if(exp_ptr+sizeof(tab_cmd) <= exp_end + && !memcmp(exp_ptr, tab_cmd, sizeof(tab_cmd))) { + exp_ptr += sizeof(tab_cmd); + if(out_ptr < out_end && *out_ptr == '\t') { + out_ptr++; + continue; + } else { + err = out_end; + } }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { if(out_ptr == out_end)

1 0

Frédéric Delanoy : cmd/tests: Add tests for tab handling.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: a91eceaec0966afe820ed746aa1e129f055668e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91eceaec0966afe820ed746a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:26:55 2011 +0200 cmd/tests: Add tests for tab handling. --- programs/cmd/tests/test_builtins.cmd | 39 +++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 43 ++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c640ec4..b815e77 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -17,6 +17,14 @@ echo:word echo :word echo word(a)space@ echo word(a)space@@space@ + echo word +echo(a)tab@word +echo(a)tab@word @tab@ +echo(a)tab@word(a)tab@@space@ +(a)tab@echo word +echo @tab(a)word +echo @tab(a)word +echo(a)tab@@tab(a)word @echo off echo ------------ Testing 'echo' [OFF] -------------- @@ -35,6 +43,14 @@ echo:word echo :word echo word(a)space@ echo word(a)space@@space@ + echo word +echo(a)tab@word +echo(a)tab@word @tab@ +echo(a)tab@word(a)tab@@space@ +(a)tab@echo word +echo @tab(a)word +echo @tab(a)word +echo(a)tab@@tab(a)word echo ------------ Testing redirection operators -------------- mkdir foobar & cd foobar @@ -140,6 +156,14 @@ set BAZ%= echo set "FOO=bar" should not include the quotes in the variable value set "FOO=bar" echo %FOO% +set(a)tab@FOO=foo +echo %FOO% +set(a)tab@FOO= +echo '%FOO%' +set FOO=foo(a)space@ +echo '%FOO%' +set FOO=foo(a)tab@ +echo '%FOO%' set FOO= echo ------------ Testing variable expansion -------------- @@ -266,12 +290,18 @@ cd..(a)space@ cd if not exist foobar (cd ..) cd foobar +cd(a)tab@..(a)tab@@space@@tab@ +cd +if not exist foobar (cd ..) +cd foobar mkdir "bar bak" cd "bar bak" cd cd .. cd bar bak cd +cd "bar bak(a)space@"@tab@@space@ +cd cd ..\.. cd rd /Q/s foobar @@ -282,7 +312,7 @@ echo bar> foobaz type foobaz echo *** @echo off -type foobaz +type foobaz(a)tab@ echo *** del foobaz @@ -296,7 +326,7 @@ dir /b /a-d echo foo > nul dir /b /a-d echo foo > NuL -dir /b /a-d +(a)tab@dir /b(a)tab@/a-d del bar rem NUL not special everywhere call :setError 123 @@ -351,6 +381,11 @@ for %%i in (A B C) do call :forTestFun1 %%i for %%i in (1,4,1) do echo %%i for %%i in (A, B,C) do echo %%i for %%i in (X) do echo %%i +for(a)tab@%%i in (X2) do echo %%i +for %%i in(a)tab@(X3) do echo %%i +for %%i in (@tab@ foo(a)tab@) do echo %%i +for(a)tab@ %%i in(a)tab@(@tab(a)M) do echo %%i +for %%i(a)tab@in (X)@tab(a)do@tab(a)echo %%i goto :endForTestFun1 :forTestFun1 echo %1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1580637..18ba102 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -47,6 +47,30 @@ word(a)space@ @pwd@>echo word(a)space@@space@@space@ word(a)space@@space@ + +(a)todo_wine@@pwd@>echo word(a)space@ +word + +(a)pwd@>echo(a)tab@word(a)space@ +(a)todo_wine@word + +(a)pwd@>echo(a)tab@word(a)space@@tab@@space@ +(a)todo_wine@word(a)space@@tab@ + +(a)pwd@>echo(a)tab@word(a)tab@@space@@space@ +(a)todo_wine@word(a)tab@@space@ + +(a)todo_wine@@pwd@>echo word(a)space@ +word + +(a)pwd@>echo(a)space@@tab(a)word@space@ +(a)tab@word + +(a)pwd@>echo(a)space@@space@@tab(a)word@space@ +(a)space@@tab(a)word + +(a)pwd@>echo(a)tab@@tab(a)word@space@ +(a)todo_wine@@tab(a)word ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' @@ -63,6 +87,14 @@ word :word word(a)space@ word(a)space@@space@ +word +(a)todo_wine@word +(a)todo_wine@word(a)space@@tab@ +(a)todo_wine@word(a)tab@@space@ +word +(a)tab@word +(a)space@@tab(a)word +(a)todo_wine@@tab(a)word ------------ Testing redirection operators -------------- ...stdout redirection foo @@ -126,6 +158,10 @@ BAZ=bazbaz bazbaz set "FOO=bar" should not include the quotes in the variable value bar +(a)todo_wine@foo +(a)todo_wine@'' +'foo(a)space@' +'foo(a)tab@' ------------ Testing variable expansion -------------- ~dp0 should be directory containing batch file @pwd@\ @@ -189,6 +225,8 @@ Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ @pwd@\foobar @pwd@ @todo_wine@@pwd@ +(a)todo_wine@@pwd@ +(a)pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@ @@ -237,6 +275,11 @@ A B C X +(a)todo_wine@X2 +(a)todo_wine@X3 +foo +(a)todo_wine@M +(a)todo_wine@X ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y

1 0