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

Henri Verbeet : wined3d: Get rid of the fglrx point sprite hack.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 812a31482149116e4d3332791d4bd42ba641791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=812a31482149116e4d3332791… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:31 2011 +0200 wined3d: Get rid of the fglrx point sprite hack. Fglrx 9.3 is well over 2 years old at this point. I'd strongly encourage anyone still affected by this to upgrade to the r300g driver. --- dlls/wined3d/context.c | 11 ++++++--- dlls/wined3d/directx.c | 41 ---------------------------------------- dlls/wined3d/state.c | 13 ------------ dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 7 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 620a89b..ac252d8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1522,11 +1522,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } - for (s = 0; s < gl_info->limits.point_sprite_units; ++s) + if (gl_info->supported[ARB_POINT_SPRITE]) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + for (s = 0; s < gl_info->limits.textures; ++s) + { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + } } if (gl_info->supported[ARB_PROVOKING_VERTEX]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a93895e..cdf3c11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -596,13 +596,6 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const return TRUE; } -static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return gl_vendor == GL_VENDOR_FGLRX; - -} - static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { @@ -801,27 +794,6 @@ static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } -/* fglrx crashes with a very bad kernel panic if GL_POINT_SPRITE_ARB is set to GL_COORD_REPLACE_ARB - * on more than one texture unit. This means that the d3d9 visual point size test will cause a - * kernel panic on any machine running fglrx 9.3(latest that supports r300 to r500 cards). This - * quirk only enables point sprites on the first texture unit. This keeps point sprites working in - * most games, but avoids the crash - * - * A more sophisticated way would be to find all units that need texture coordinates and enable - * point sprites for one if only one is found, and software emulate point sprites in drawStridedSlow - * if more than one unit needs texture coordinates(This requires software ffp and vertex shaders though) - * - * Note that disabling the extension entirely does not gain predictability because there is no point - * sprite capability flag in d3d, so the potential rendering bugs are the same if we disable the extension. */ -static void quirk_one_point_sprite(struct wined3d_gl_info *gl_info) -{ - if (gl_info->supported[ARB_POINT_SPRITE]) - { - TRACE("Limiting point sprites to one texture unit.\n"); - gl_info->limits.point_sprite_units = 1; - } -} - static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { quirk_arb_constants(gl_info); @@ -963,11 +935,6 @@ static const struct driver_quirk quirk_table[] = "Init texcoord .w for Apple ATI >= r600 GPU driver" }, { - match_fglrx, - quirk_one_point_sprite, - "Fglrx point sprite crash workaround" - }, - { match_dx10_capable, quirk_clip_varying, "Reserved varying for gl_ClipPos" @@ -2625,14 +2592,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } - if (gl_info->supported[ARB_POINT_SPRITE]) - { - gl_info->limits.point_sprite_units = gl_info->limits.textures; - } - else - { - gl_info->limits.point_sprite_units = 0; - } checkGLcall("extension detection"); LEAVE_GL(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c3dd7ff..b3c1270 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1594,21 +1594,8 @@ static void state_pointsprite_w(struct wined3d_context *context, const struct wi static void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->render_states[WINED3DRS_POINTSPRITEENABLE]) { - static BOOL warned; - - if (gl_info->limits.point_sprite_units < gl_info->limits.textures && !warned) - { - if (use_ps(state) || state->lowest_disabled_stage > gl_info->limits.point_sprite_units) - { - FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n"); - warned = TRUE; - } - } - glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d340049..129c156 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1445,7 +1445,6 @@ struct wined3d_gl_limits UINT texture3d_size; float pointsize_max; float pointsize_min; - UINT point_sprite_units; UINT blends; UINT anisotropy; float shininess;

1 0

André Hentschel : c2man: Mark the file used if a comment is found.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 1923e0e159b0c8140cf28d5378bd7c34b2ac1fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1923e0e159b0c8140cf28d537… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 4 21:08:37 2011 +0200 c2man: Mark the file used if a comment is found. --- tools/c2man.pl | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index ce8a444..7eca8c4 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -300,6 +300,9 @@ sub process_source_file($) { if ( /^\/\**$/ ) { + # This file is used by the DLL - Make sure we get our contributors right + @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); + push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); # Found a comment start $comment->{COMMENT_NAME} = ""; $comment->{ALT_NAME} = ""; @@ -419,10 +422,6 @@ sub process_source_file($) if ($parse_state == 4) # Reading in the function definition { - # This file is used by the DLL - Make sure we get our contributors right - @{$spec_files{$comment->{DLL_NAME}}[0]->{CURRENT_EXTRA}} = (); - push (@{$spec_files{$comment->{DLL_NAME}}[0]->{SOURCES}},$comment->{FILE}); - push (@{$comment->{PROTOTYPE}},$_); # Strip comments from the line before checking for ')' my $stripped_line = $_;

1 0

Alexandre Julliard : gdi32: Add a missing release in the error path.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 805f083f3464b7f4b9f68cbe67578cb12cbbcd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f083f3464b7f4b9f68cbe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 10:58:16 2011 +0200 gdi32: Add a missing release in the error path. --- dlls/gdi32/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 3d7e1a2..69b09ad 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -179,6 +179,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + GDI_ReleaseObj( hbitmap ); return ERROR_BAD_FORMAT; }

1 0

Alexandre Julliard : gdi32: Validate the DIB parameters in functions that take a BITMAPINFO.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: cf4c565fd28361475f532a169fe8b0a3c31d7e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4c565fd28361475f532a169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:12:42 2011 +0200 gdi32: Validate the DIB parameters in functions that take a BITMAPINFO. --- dlls/gdi32/dib.c | 88 +++++++++++------ dlls/gdi32/tests/bitmap.c | 236 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 281 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf4c565fd28361475f532…

1 0

Alexandre Julliard : gdi32: Always set compression to BI_BITFIELDS for 16-bpp DIB sections.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: c668354cc0d66f8f8a73fa1c302aad41c36eb869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c668354cc0d66f8f8a73fa1c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:30:10 2011 +0200 gdi32: Always set compression to BI_BITFIELDS for 16-bpp DIB sections. --- dlls/gdi32/dib.c | 9 ++------- dlls/gdi32/tests/dib.c | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 79d339b..ebc6fe4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1221,15 +1221,9 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBmih.biClrUsed = 1 << info->bmiHeader.biBitCount; /* set dsBitfields values */ - dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; - if (info->bmiHeader.biBitCount == 16 && info->bmiHeader.biCompression == BI_RGB) { - /* In this case Windows changes biCompression to BI_BITFIELDS, - however for now we won't do this, as there are a lot - of places where BI_BITFIELDS is currently unsupported. */ - - /* dib->dsBmih.biCompression = compression = BI_BITFIELDS;*/ + dib->dsBmih.biCompression = BI_BITFIELDS; dib->dsBitfields[0] = 0x7c00; dib->dsBitfields[1] = 0x03e0; dib->dsBitfields[2] = 0x001f; @@ -1241,6 +1235,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBitfields[2] = *((const DWORD *)bmi->bmiColors + 2); if (!dib->dsBitfields[0] || !dib->dsBitfields[1] || !dib->dsBitfields[2]) goto error; } + else dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; /* get storage location for DIB bits */ diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 69f241c..a1c9d27 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1125,7 +1125,6 @@ static void test_simple_graphics(void) ok(ds.dsBitfields[0] == 0x7c00, "got %08x\n", ds.dsBitfields[0]); ok(ds.dsBitfields[1] == 0x03e0, "got %08x\n", ds.dsBitfields[1]); ok(ds.dsBitfields[2] == 0x001f, "got %08x\n", ds.dsBitfields[2]); -todo_wine ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); orig_bm = SelectObject(mem_dc, dib);

1 0

Alexandre Julliard : gdi32: Always use BI_BITFIELDS for 16-bpp in GetImage.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 3a1194edd7f3c289a2b901bf5ddee65d1119dca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1194edd7f3c289a2b901bf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:33:58 2011 +0200 gdi32: Always use BI_BITFIELDS for 16-bpp in GetImage. --- dlls/gdi32/bitmap.c | 8 ++++++++ dlls/gdi32/dibdrv/dc.c | 23 ++++++++--------------- dlls/winex11.drv/bitblt.c | 3 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 69b09ad..8117d6d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -67,6 +67,14 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; + if (bmp->bitmap.bmBitsPixel == 16) + { + DWORD *masks = (DWORD *)info->bmiColors; + masks[0] = 0x7c00; + masks[1] = 0x03e0; + masks[2] = 0x001f; + info->bmiHeader.biCompression = BI_BITFIELDS; + } if (!bits) goto done; height = src->visrect.bottom - src->visrect.top; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 17b2966..b5f4f2b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -339,6 +339,8 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) static void set_color_info( const dib_info *dib, BITMAPINFO *info ) { + DWORD *masks = (DWORD *)info->bmiColors; + info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biClrUsed = 0; @@ -355,19 +357,14 @@ static void set_color_info( const dib_info *dib, BITMAPINFO *info ) } break; case 16: - if (dib->funcs != &funcs_555) - { - DWORD *masks = (DWORD *)info->bmiColors; - masks[0] = dib->red_mask; - masks[1] = dib->green_mask; - masks[2] = dib->blue_mask; - info->bmiHeader.biCompression = BI_BITFIELDS; - } + masks[0] = dib->red_mask; + masks[1] = dib->green_mask; + masks[2] = dib->blue_mask; + info->bmiHeader.biCompression = BI_BITFIELDS; break; case 32: if (dib->funcs != &funcs_8888) { - DWORD *masks = (DWORD *)info->bmiColors; masks[0] = dib->red_mask; masks[1] = dib->green_mask; masks[2] = dib->blue_mask; @@ -417,12 +414,8 @@ static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } break; case 16: - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && - memcmp( bmp->dib->dsBitfields, bit_fields_555, sizeof(bmp->dib->dsBitfields) )) - { - info->bmiHeader.biCompression = BI_BITFIELDS; - memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); - } + info->bmiHeader.biCompression = BI_BITFIELDS; + memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); break; case 32: if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d2383a..7f314c2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1641,8 +1641,7 @@ static void set_color_info( PHYSDEV dev, const ColorShifts *color_shifts, BITMAP colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift; colors[1] = color_shifts->logicalGreen.max << color_shifts->logicalGreen.shift; colors[2] = color_shifts->logicalBlue.max << color_shifts->logicalBlue.shift; - if (colors[0] != 0x7c00 || colors[1] != 0x03e0 || colors[2] != 0x001f) - info->bmiHeader.biCompression = BI_BITFIELDS; + info->bmiHeader.biCompression = BI_BITFIELDS; break; case 32: colors[0] = color_shifts->logicalRed.max << color_shifts->logicalRed.shift;

1 0

Francois Gouget : kernel32: Implement K32GetProcessImageFileNameA().
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 3b239dbc62b6bb73126c987ccd080a8911df064a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b239dbc62b6bb73126c987cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 09:56:26 2011 +0200 kernel32: Implement K32GetProcessImageFileNameA(). --- dlls/kernel32/process.c | 3 +-- dlls/psapi/tests/psapi_main.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9bc5070..b0eba7c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3479,8 +3479,7 @@ cleanup: */ DWORD WINAPI K32GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) { - FIXME("(%p, %p, %d) stub\n", process, file, size ); - return 0; + return QueryFullProcessImageNameA(process, PROCESS_NAME_NATIVE, file, &size) ? size : 0; } /*********************************************************************** diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b855250..c4c129b 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -222,15 +222,15 @@ static void test_GetProcessImageFileName(void) SetLastError(0xdeadbeef); pGetProcessImageFileNameA(NULL, szImgPath, sizeof(szImgPath)); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); pGetProcessImageFileNameA(hpSR, szImgPath, sizeof(szImgPath)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); pGetProcessImageFileNameA(hpQI, szImgPath, 0); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); ret = pGetProcessImageFileNameA(hpQI, szImgPath, sizeof(szImgPath)); ret1 = pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath));

1 0

Francois Gouget : shell32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 05 Aug '11

05 Aug '11

Module: wine Branch: master Commit: 319f3b7d6d74fb3c1922ab7efb3614b0edf53956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319f3b7d6d74fb3c1922ab7ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 09:56:34 2011 +0200 shell32: Remove WINAPI on static functions where not needed. --- dlls/shell32/shlmenu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index eb68939..b37d526 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1088,7 +1088,7 @@ static ULONG WINAPI CompositeCMenu_Release(IContextMenu3 *iface) return 0; } -static UINT WINAPI CompositeCMenu_GetIndexForCommandId(CompositeCMenu *This,UINT id) +static UINT CompositeCMenu_GetIndexForCommandId(CompositeCMenu *This,UINT id) { UINT low=0; UINT high=This->menu_count;

1 0

Frédéric Delanoy : tests: Assorted spelling fixes .
by Alexandre Julliard 04 Aug '11

04 Aug '11

1 0

Frédéric Delanoy : cmd/tests: Add FOR /A tests.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 28fe027eee5d093aa3fd99839161a907cdd568d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fe027eee5d093aa3fd99839… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 16:01:48 2011 +0200 cmd/tests: Add FOR /A tests. --- programs/cmd/tests/test_builtins.cmd | 79 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 70 ++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a27c833..a83e568 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -385,6 +385,85 @@ rem for /L %%i in (1,1,1) do echo %%i rem for /L %%i in (1,-2,-1) do echo %%i rem for /L %%i in (-1,-1,-1) do echo %%i rem for /L %%i in (1,2, 3) do echo %%i +echo ...for /a +rem No output when using "set expr" syntax, unless in interactive mode +rem Need to use "set envvar=expr" to use in a batch script +echo ......individual operations +set var=0 +set /a var=1 +2 & echo %var% +set /a var=1 +-2 & echo %var% +set /a var=1 --2 & echo %var% +set /a var=2* 3 & echo %var% +set /a var=-2* -5 & echo %var% +set /a var=12/3 & echo %var% +set /a var=13/3 & echo %var% +set /a var=-13/3 & echo %var% +rem FIXME Divide by zero should return an error, but error messages cannot be tested with current infrastructure +set /a var=5 %% 5 & echo %var% +set /a var=5 %% 3 & echo %var% +set /a var=5 %% -3 & echo %var% +set /a var=-5 %% -3 & echo %var% +set /a var=1 ^<^< 0 & echo %var% +set /a var=1 ^<^< 2 & echo %var% +set /a var=1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< -2 & echo %var% +set /a var=-1 ^<^< 2 & echo %var% +set /a var=9 ^>^> 0 & echo %var% +set /a var=9 ^>^> 2 & echo %var% +set /a var=9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> -2 & echo %var% +set /a var=-9 ^>^> 2 & echo %var% +set /a var=5 ^& 0 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^& 3 & echo %var% +set /a var=5 ^& 4 & echo %var% +set /a var=5 ^& 1 & echo %var% +set /a var=5 ^| 0 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^| 3 & echo %var% +set /a var=5 ^| 4 & echo %var% +set /a var=5 ^| 1 & echo %var% +set /a var=5 ^^ 0 & echo %var% +set /a var=5 ^^ 1 & echo %var% +set /a var=5 ^^ 3 & echo %var% +set /a var=5 ^^ 4 & echo %var% +set /a var=5 ^^ 1 & echo %var% +echo ......precedence and grouping +set /a var=4 + 2*3 & echo %var% +set /a var=(4+2)*3 & echo %var% +set /a var=4 * 3/5 & echo %var% +set /a var=(4 * 3)/5 & echo %var% +set /a var=4 * 5 %% 4 & echo %var% +set /a var=4 * (5 %% 4) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ 2) & echo %var% +set /a var=3 %% (5 + 8 %% 3 ^^ -2) & echo %var% +echo ......octal and hexadecimal +set /a var=0xf + 3 & echo %var% +set /a var=0xF + 3 & echo %var% +set /a var=015 + 2 & echo %var% +set /a var=3, 8+3,0 & echo %var% +echo ......variables +set /a var=foo=3, foo+1 & echo %var% +if defined foo (echo %foo%) else ( + echo foo not defined +) +set /a var=foo=3, foo+=1 & echo %var% +set /a var=foo=3, bar=1, bar+=foo, bar & echo %var% +set /a var=foo*= foo & echo %var% +set /a var=whateverNonExistingVar & echo %var% +set /a var=whateverNonExistingVar + bar & echo %var% +set /a var=foo -= foo + 7 & echo %var% +set /a var=foo /= 3 + 2 & echo %var% +set /a var=foo=5, foo %%=2 & echo %var% +set /a var=foo ^<^<= 2 & echo %var% +set /a var=foo ^>^>= 2 & echo %var% +set /a var=foo ^&= 2 & echo %var% +set /a var=foo=5, foo ^|= 2 & echo %var% +set /a var=foo=5, foo ^^= 2 & echo %var% +set /a var=foo=19, foo %%= 4 + (bar %%= 7) & echo. +set foo= +set bar= +set var= echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c4f0d76..ec0ece4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -253,6 +253,76 @@ bar -1 @todo_wine(a)ErrorLevel 0 @todo_wine(a)ErrorLevel 0 +...for /a +......individual operations +0 +(a)todo_wine@3 +(a)todo_wine@-1 +(a)todo_wine@3 +(a)todo_wine@6 +(a)todo_wine@10 +(a)todo_wine@4 +(a)todo_wine@4 +(a)todo_wine@-4 +0 +(a)todo_wine@2 +(a)todo_wine@2 +(a)todo_wine@-2 +(a)todo_wine@1 +(a)todo_wine@4 +0(a)or_broken@1073741824 +0(a)or_broken@-1073741824 +(a)todo_wine@-4 +(a)todo_wine@9 +(a)todo_wine@2 +0 +(a)todo_wine@-1 +(a)todo_wine@-3 +0 +(a)todo_wine@1 +(a)todo_wine@1 +(a)todo_wine@4 +(a)todo_wine@1 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@7 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@5 +(a)todo_wine@4 +(a)todo_wine@6 +(a)todo_wine@1 +......precedence and grouping +(a)todo_wine@4 +(a)todo_wine@10 +(a)todo_wine@18(a)or_broken@10 +(a)todo_wine@2(a)or_broken@0 +(a)todo_wine@2(a)or_broken@0 +0(a)or_broken@4 +(a)todo_wine@4 +(a)todo_wine@3(a)or_broken@4 +......octal and hexadecimal +(a)todo_wine@3(a)or_broken@4 +(a)todo_wine@18 +(a)todo_wine@18 +(a)todo_wine@15 +......variables +(a)todo_wine@3 +(a)todo_wine@3(a)or_broken@foo not defined +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@3(a)or_broken@0 +(a)todo_wine@9(a)or_broken@0 +0 +(a)todo_wine@4(a)or_broken@0 +(a)todo_wine@-7(a)or_broken@0 +(a)todo_wine@-1(a)or_broken@0 +(a)todo_wine@5(a)or_broken@0 +(a)todo_wine@4(a)or_broken@0 +(a)todo_wine@1(a)or_broken@0 +0 +(a)todo_wine@5(a)or_broken@0 + -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0