July 2024 - Wine-commits - list.winehq.org

Connor McAdams : d3dx9/tests: Add more tests for D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: ab512adc1e57e8a70c481adec8183856680fdf9f URL: https://gitlab.winehq.org/wine/wine/-/commit/ab512adc1e57e8a70c481adec81838… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:15:55 2024 -0400 d3dx9/tests: Add more tests for D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/d3dx9_test_images.h | 102 ++++++++++++++++++++ dlls/d3dx9_36/tests/texture.c | 166 +++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/volume.c | 100 ------------------- 3 files changed, 267 insertions(+), 101 deletions(-)

1 0

Connor McAdams : d3dx9: Refactor texture creation and cleanup in D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 935c324d3a233e038bae299cb020b7d4aba0a3f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/935c324d3a233e038bae299cb020b7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:28:46 2024 -0400 d3dx9: Refactor texture creation and cleanup in D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/texture.c | 59 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8314146a264..09219d8073b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1104,7 +1104,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic BOOL file_depth = FALSE; BOOL file_format = FALSE; BOOL file_mip_levels = FALSE; - IDirect3DVolumeTexture9 *tex, *buftex; + IDirect3DVolumeTexture9 *tex, *staging_tex; TRACE("device %p, data %p, data_size %u, width %u, height %u, depth %u, mip_levels %u, " "usage %#lx, format %#x, pool %#x, filter %#lx, mip_filter %#lx, color_key 0x%08lx, " @@ -1115,6 +1115,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic if (!device || !data || !data_size || !volume_texture) return D3DERR_INVALIDCALL; + staging_tex = tex = *volume_texture = NULL; hr = D3DXGetImageInfoFromFileInMemory(data, data_size, &image_info); if (FAILED(hr)) return hr; @@ -1170,7 +1171,11 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic } hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mip_levels, usage, &format, pool); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + FIXME("Couldn't find suitable texture parameters.\n"); + goto err; + } if ((file_width && width != image_info.Width) || (file_height && height != image_info.Height) @@ -1181,7 +1186,10 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); if (FAILED(hr)) - return D3DERR_INVALIDCALL; + { + hr = D3DERR_INVALIDCALL; + goto err; + } if (mip_levels > image_info.MipLevels) { @@ -1192,41 +1200,54 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); - tex = buftex; + TRACE("Creating staging texture.\n"); + hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &staging_tex); + tex = staging_tex; } else { hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); - buftex = NULL; } - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + FIXME("Texture creation failed.\n"); + goto err; + } + + TRACE("Texture created correctly. Now loading the texture data into it.\n"); hr = load_volume_texture_from_dds(tex, data, palette, filter, color_key, &image_info); if (FAILED(hr)) { - IDirect3DVolumeTexture9_Release(tex); - return hr; + FIXME("Texture loading failed.\n"); + goto err; } - if (buftex) + /* Move the data to the actual texture if necessary. */ + if (staging_tex) { - hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); + hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, volume_texture); if (FAILED(hr)) - { - IDirect3DVolumeTexture9_Release(buftex); - return hr; - } + goto err; - IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)buftex, (IDirect3DBaseTexture9 *)tex); - IDirect3DVolumeTexture9_Release(buftex); + IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)staging_tex, (IDirect3DBaseTexture9 *)(*volume_texture)); + IDirect3DVolumeTexture9_Release(staging_tex); + } + else + { + *volume_texture = tex; } if (info) *info = image_info; - *volume_texture = tex; - return D3D_OK; + return hr; + +err: + if (tex) + IDirect3DVolumeTexture9_Release(tex); + + return hr; } static inline void fill_texture(const struct pixel_format_desc *format, BYTE *pos, const D3DXVECTOR4 *value)

1 0

Connor McAdams : d3dx9: Cleanup texture value argument handling in D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 438fba77d7957c744be9eefb707f81b3bd2d992f URL: https://gitlab.winehq.org/wine/wine/-/commit/438fba77d7957c744be9eefb707f81… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:31:59 2024 -0400 d3dx9: Cleanup texture value argument handling in D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/texture.c | 72 ++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 09219d8073b..b968fb35aec 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1098,13 +1098,8 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic HRESULT hr; D3DCAPS9 caps; D3DXIMAGE_INFO image_info; - BOOL dynamic_texture; - BOOL file_width = FALSE; - BOOL file_height = FALSE; - BOOL file_depth = FALSE; - BOOL file_format = FALSE; - BOOL file_mip_levels = FALSE; IDirect3DVolumeTexture9 *tex, *staging_tex; + BOOL dynamic_texture, format_specified = FALSE; TRACE("device %p, data %p, data_size %u, width %u, height %u, depth %u, mip_levels %u, " "usage %#lx, format %#x, pool %#x, filter %#lx, mip_filter %#lx, color_key 0x%08lx, " @@ -1122,53 +1117,18 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic if (image_info.ImageFileFormat != D3DXIFF_DDS) return D3DXERR_INVALIDDATA; - if (width == 0 || width == D3DX_DEFAULT_NONPOW2) - width = image_info.Width; - if (width == D3DX_DEFAULT) - width = make_pow2(image_info.Width); - - if (height == 0 || height == D3DX_DEFAULT_NONPOW2) - height = image_info.Height; - if (height == D3DX_DEFAULT) - height = make_pow2(image_info.Height); - - if (depth == 0 || depth == D3DX_DEFAULT_NONPOW2) - depth = image_info.Depth; - if (depth == D3DX_DEFAULT) - depth = make_pow2(image_info.Depth); - - if (format == D3DFMT_UNKNOWN || format == D3DX_DEFAULT) - format = image_info.Format; - - if (width == D3DX_FROM_FILE) - { - file_width = TRUE; - width = image_info.Width; - } - - if (height == D3DX_FROM_FILE) - { - file_height = TRUE; - height = image_info.Height; - } - - if (depth == D3DX_FROM_FILE) - { - file_depth = TRUE; - depth = image_info.Depth; - } - - if (format == D3DFMT_FROM_FILE) - { - file_format = TRUE; - format = image_info.Format; - } + /* Handle default values. */ + if (!width || width == D3DX_DEFAULT_NONPOW2 || width == D3DX_FROM_FILE || width == D3DX_DEFAULT) + width = (width == D3DX_DEFAULT) ? make_pow2(image_info.Width) : image_info.Width; + if (!height || height == D3DX_DEFAULT_NONPOW2 || height == D3DX_FROM_FILE || height == D3DX_DEFAULT) + height = (height == D3DX_DEFAULT) ? make_pow2(image_info.Height) : image_info.Height; + if (!depth || depth == D3DX_DEFAULT_NONPOW2 || depth == D3DX_FROM_FILE || depth == D3DX_DEFAULT) + depth = (depth == D3DX_DEFAULT) ? make_pow2(image_info.Depth) : image_info.Depth; - if (mip_levels == D3DX_FROM_FILE) - { - file_mip_levels = TRUE; - mip_levels = image_info.MipLevels; - } + format_specified = (format != D3DFMT_UNKNOWN && format != D3DX_DEFAULT); + if (format == D3DFMT_FROM_FILE || format == D3DFMT_UNKNOWN || format == D3DX_DEFAULT) + format = image_info.Format; + mip_levels = (mip_levels == D3DX_FROM_FILE) ? image_info.MipLevels : mip_levels; hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mip_levels, usage, &format, pool); if (FAILED(hr)) @@ -1177,12 +1137,8 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } - if ((file_width && width != image_info.Width) - || (file_height && height != image_info.Height) - || (file_depth && depth != image_info.Depth) - || (file_format && format != image_info.Format) - || (file_mip_levels && mip_levels != image_info.MipLevels)) - return D3DERR_NOTAVAILABLE; + if (color_key && !format_specified) + format = get_alpha_replacement_format(format); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); if (FAILED(hr))

1 0

Connor McAdams : d3dx9: Use d3dx_image structure inside of D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: c9e6f6f84f661bdd190f4475296a7ce1d3885516 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9e6f6f84f661bdd190f4475296a7c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:41:59 2024 -0400 d3dx9: Use d3dx_image structure inside of D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 - dlls/d3dx9_36/surface.c | 52 ------------------------- dlls/d3dx9_36/tests/texture.c | 88 +++++++++++++++++++++---------------------- dlls/d3dx9_36/texture.c | 47 ++++++++++++++++++++--- 4 files changed, 85 insertions(+), 104 deletions(-)

1 0

Connor McAdams : d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 797df8df394d81a165328f9ac6b4039253a78718 URL: https://gitlab.winehq.org/wine/wine/-/commit/797df8df394d81a165328f9ac6b403… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:45:46 2024 -0400 d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 12 +++++------- dlls/d3dx9_36/texture.c | 13 +++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index e7362923c80..47ac46e9d3b 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2550,16 +2550,14 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev D3DX_DEFAULT, D3DX_FILTER_POINT, 0, &img_info, NULL, &texture); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - check_texture_mip_levels(texture, 3, TRUE); + check_texture_mip_levels(texture, 3, FALSE); check_image_info(&img_info, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_BMP, FALSE); check_volume_texture_level_desc(texture, 0, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 4, 4, 1, FALSE); - check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, TRUE); - check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, TRUE); + check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, FALSE); + check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, FALSE); for (mip_level = 0; mip_level < 3; ++mip_level) { - BOOL todo = !!mip_level; - IDirect3DVolumeTexture9_GetLevelDesc(texture, mip_level, &desc); get_texture_volume_readback(device, texture, mip_level, &volume_rb); for (z = 0; z < desc.Depth; ++z) @@ -2571,9 +2569,9 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev for (x = 0; x < desc.Width; ++x) { if (desc.Width == 1 || x < (desc.Width / 2)) - check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], todo); + check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], FALSE); else - check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], todo); + check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], FALSE); } } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6f936b4d922..b42c9db3f2d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1154,12 +1154,6 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } - if (mip_levels > image_info.MipLevels) - { - FIXME("Generation of mipmaps for volume textures is not implemented yet.\n"); - mip_levels = image_info.MipLevels; - } - dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { @@ -1214,6 +1208,13 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } + hr = D3DXFilterTexture((IDirect3DBaseTexture9 *)tex, palette, loaded_miplevels - 1, mip_filter); + if (FAILED(hr)) + { + FIXME("Texture filtering failed.\n"); + goto err; + } + /* Move the data to the actual texture if necessary. */ if (staging_tex) {

1 0

Alex Henrie : mscoree: Pass size in bytes to RegGetValueW.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: bfed14d6bc5147a559d4fa2dc518ab727373fdcb URL: https://gitlab.winehq.org/wine/wine/-/commit/bfed14d6bc5147a559d4fa2dc518ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 2 23:40:00 2024 -0600 mscoree: Pass size in bytes to RegGetValueW. --- dlls/mscoree/corruntimehost.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index f5a3831c90e..d9864b4dcd2 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1738,8 +1738,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) WCHAR codebase[MAX_PATH + 8]; WCHAR classname[350], subkeyName[256]; WCHAR filename[MAX_PATH]; - - DWORD dwBufLen = 350; + DWORD dwBufLen; lstrcpyW(path, wszCLSIDSlash); StringFromGUID2(clsid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); @@ -1758,7 +1757,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID*); IClassFactory *classfactory; - dwBufLen = ARRAY_SIZE( filename ); + dwBufLen = sizeof( filename ); res = RegGetValueW( subkey, NULL, NULL, RRF_RT_REG_SZ, NULL, filename, &dwBufLen ); RegCloseKey( subkey ); @@ -1796,6 +1795,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) goto cleanup; } + dwBufLen = sizeof( classname ); res = RegGetValueW( key, NULL, L"Class", RRF_RT_REG_SZ, NULL, classname, &dwBufLen); if(res != ERROR_SUCCESS) { @@ -1806,7 +1806,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) TRACE("classname (%s)\n", debugstr_w(classname)); - dwBufLen = MAX_PATH + 8; + dwBufLen = sizeof( codebase ); res = RegGetValueW( key, NULL, L"CodeBase", RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); if(res == ERROR_SUCCESS) { @@ -1841,7 +1841,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); if (res != ERROR_SUCCESS) goto cleanup; - dwBufLen = MAX_PATH + 8; + dwBufLen = sizeof( assemblyname ); res = RegGetValueW(subkey, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); RegCloseKey(subkey); if (res != ERROR_SUCCESS) @@ -1849,7 +1849,7 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) } else { - dwBufLen = MAX_PATH + 8; + dwBufLen = sizeof( assemblyname ); res = RegGetValueW(key, NULL, L"Assembly", RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); if (res != ERROR_SUCCESS) goto cleanup;

1 0

Eric Pouech : cmd: Add some more tests for success/failure.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: c7e5e4c021cbc8f178f5fe5a97410378ab210c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e5e4c021cbc8f178f5fe5a974103… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 3 10:07:31 2024 +0200 cmd: Add some more tests for success/failure. Focusing on POPD and RMDIR/RD that don't set errorlevel in case of failure. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 25 +++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d5f8cef8eab..fed8c20c587 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -458,6 +458,7 @@ call :setError 0 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! call :setError 33 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel! call :setError 666 & (echo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (echo foo >> h:\i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & echo foo >> h:\i\dont\exist\at\all.txt & echo ERRORLEVEL !errorlevel! call :setError 666 & ((if 1==1 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((if 1==0 echo "">NUL) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((if 1==1 (call :setError 33)) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) @@ -550,6 +551,7 @@ call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !error call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (popd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (popd &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & popd & echo ERRORLEVEL !errorlevel! cd .. && rd /q /s foo echo --- success/failure for DIR command @@ -565,6 +567,29 @@ call :setError 666 & (dir zzz fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILU call :setError 666 & (dir dir\zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (dir file* >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) cd .. && rd /q /s foo +echo --- success/failure for RMDIR/RD command +mkdir foo & cd foo +mkdir abc +call :setError 666 & (rmdir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo "">abc\abc +call :setError 666 & (rmdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rmdir abc\abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +erase abc\abc +call :setError 666 & (rmdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rmdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (rmdir @:\cba\abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo +mkdir foo & cd foo +mkdir abc +call :setError 666 & rmdir & echo ERRORLEVEL !errorlevel! +echo "">abc\abc +call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! +call :setError 666 & rmdir abc\abc & echo ERRORLEVEL !errorlevel! +erase abc\abc +call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! +call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! +call :setError 666 & rmdir @:\cba\abc & echo ERRORLEVEL !errorlevel! +cd .. && rd /q /s foo echo --- setlocal DisableDelayedExpansion diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eb6abb14dea..dc2288742da 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -456,6 +456,7 @@ FAILURE 33 foo(a)space@ SUCCESS 666 FAILURE 1 +(a)todo_wine@ERRORLEVEL 666 SUCCESS 666 SUCCESS 666 FAILURE 33 @@ -513,6 +514,7 @@ SUCCESS 0 FAILURE 1 SUCCESS 666 @todo_wine(a)FAILURE 1 +ERRORLEVEL 666 --- success/failure for DIR command FAILURE 1 FAILURE 1 @@ -520,6 +522,19 @@ SUCCESS 0 SUCCESS 0 FAILURE 1 SUCCESS 0 +--- success/failure for RMDIR/RD command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 145 +(a)todo_wine@FAILURE 267 +SUCCESS 666 +(a)todo_wine@FAILURE 2 +(a)todo_wine@FAILURE 3 +ERRORLEVEL 666 +ERRORLEVEL 666 +ERRORLEVEL 666 +ERRORLEVEL 666 +ERRORLEVEL 666 +ERRORLEVEL 666 @todo_wine(a)--- ------------ Testing 'set' ------------ 1

1 0

Eric Pouech : cmd: Return tri-state for WCMD_ReadParseLine().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: b1ff1a0415fe98126540078697d6b2bc1e40886a URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ff1a0415fe98126540078697d6b2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 3 10:27:53 2024 +0200 cmd: Return tri-state for WCMD_ReadParseLine(). And move handling of the syntax error cases in callers. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 31 ++++++++++++++++--------- programs/cmd/wcmd.h | 3 ++- programs/cmd/wcmdmain.c | 60 ++++++++++++++++++++++++++++--------------------- 3 files changed, 57 insertions(+), 37 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 37db7fb2b04..f350779a0db 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -46,6 +46,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandl { HANDLE h = INVALID_HANDLE_VALUE; BATCH_CONTEXT *prev_context; + RETURN_CODE return_code = NO_ERROR; if (startLabel == NULL) { h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, @@ -85,19 +86,29 @@ void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandl * the rest are handled by the main command processor. */ - while (context -> skip_rest == FALSE) { - CMD_NODE *toExecute = NULL; /* Commands left to be executed */ - if (!WCMD_ReadAndParseLine(NULL, &toExecute, h)) - break; - /* Note: although this batch program itself may be called, we are not retrying - the command as a result of a call failing to find a program, hence the - retryCall parameter below is FALSE */ - node_execute(toExecute); - node_dispose_tree(toExecute); - toExecute = NULL; + while (!context->skip_rest) + { + CMD_NODE *node; + + switch (WCMD_ReadAndParseLine(NULL, &node, h)) + { + case RPL_EOF: + context->skip_rest = TRUE; + break; + case RPL_SUCCESS: + return_code = node_execute(node); + node_dispose_tree(node); + break; + case RPL_SYNTAXERROR: + return_code = RETURN_CODE_SYNTAX_ERROR; + break; + } } CloseHandle (h); + if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) + errorlevel = return_code; + /* * If there are outstanding setlocal's to the current context, unwind them. */ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 93620f05656..c778e6bae5b 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -221,7 +221,8 @@ WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); -WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_NODE **output, HANDLE readFrom); +enum read_parse_line {RPL_SUCCESS, RPL_EOF, RPL_SYNTAXERROR}; +enum read_parse_line WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_NODE **output, HANDLE readFrom); void node_dispose_tree(CMD_NODE *cmds); RETURN_CODE node_execute(CMD_NODE *node); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f8a08878fcb..7c19011f664 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2562,7 +2562,6 @@ static BOOL node_builder_generate(struct node_builder *builder, CMD_NODE **node) { TRACE("Brackets do not match, error out without executing.\n"); WCMD_output_stderr(WCMD_LoadMessage(WCMD_BADPAREN)); - errorlevel = RETURN_CODE_SYNTAX_ERROR; } else { @@ -2765,7 +2764,7 @@ static WCHAR *fetch_next_line(BOOL feed, BOOL first_line, HANDLE from, WCHAR* bu * - Anything else gets put into the command string (including * redirects) */ -WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE readFrom) +enum read_parse_line WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE readFrom) { WCHAR *curPos; int inQuotes = 0; @@ -2790,6 +2789,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE /* handling brackets as a normal character */ BOOL acceptCommand = TRUE; struct node_builder builder; + BOOL ret; *output = NULL; /* Allocate working space for a command read from keyboard, file etc */ @@ -2800,7 +2800,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE if (optionalcmd) wcscpy(extraSpace, optionalcmd); if (!(curPos = fetch_next_line(optionalcmd == NULL, TRUE, readFrom, extraSpace))) - return NULL; + return RPL_EOF; TRACE("About to parse line (%ls)\n", extraSpace); @@ -2827,7 +2827,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE /* Prevent overflow caused by the caret escape char */ if (*curLen >= MAXSTRING) { WINE_ERR("Overflow detected in command\n"); - return NULL; + return RPL_SYNTAXERROR; } /* Certain commands need special handling */ @@ -3156,10 +3156,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_NODE **output, HANDLE } } - node_builder_generate(&builder, output); + ret = node_builder_generate(&builder, output); node_builder_dispose(&builder); - return extraSpace; + return ret ? RPL_SUCCESS : RPL_SYNTAXERROR; } static BOOL if_condition_evaluate(CMD_IF_CONDITION *cond, int *test) @@ -3822,6 +3822,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) char osver[50]; STARTUPINFOW startupInfo; const WCHAR *arg; + enum read_parse_line rpl_status; if (!GetEnvironmentVariableW(L"COMSPEC", comspec, ARRAY_SIZE(comspec))) { @@ -4073,12 +4074,15 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) */ /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); - node_execute(toExecute); - node_dispose_tree(toExecute); - toExecute = NULL; + rpl_status = WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + if (rpl_status == RPL_SUCCESS && toExecute) + { + node_execute(toExecute); + node_dispose_tree(toExecute); + } + else if (rpl_status == RPL_SYNTAXERROR) + errorlevel = RETURN_CODE_SYNTAX_ERROR; - free(cmd); return errorlevel; } @@ -4152,12 +4156,17 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) } - if (opt_k) { + if (opt_k) + { + rpl_status = WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); - node_execute(toExecute); - node_dispose_tree(toExecute); - toExecute = NULL; + if (rpl_status == RPL_SUCCESS && toExecute) + { + node_execute(toExecute); + node_dispose_tree(toExecute); + } + else if (rpl_status == RPL_SYNTAXERROR) + errorlevel = RETURN_CODE_SYNTAX_ERROR; free(cmd); } @@ -4168,16 +4177,15 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) interactive = TRUE; if (!opt_k) WCMD_version (); if (echo_mode) WCMD_output_asis(L"\r\n"); - while (TRUE) { - - /* Read until EOF (which for std input is never, but if redirect - in place, may occur */ - if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) - break; - node_execute(toExecute); - node_dispose_tree(toExecute); - if (toExecute && echo_mode) WCMD_output_asis(L"\r\n"); - toExecute = NULL; + /* Read until EOF (which for std input is never, but if redirect in place, may occur */ + while ((rpl_status = WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) != RPL_EOF) + { + if (rpl_status == RPL_SUCCESS && toExecute) + { + node_execute(toExecute); + node_dispose_tree(toExecute); + if (echo_mode) WCMD_output_asis(L"\r\n"); + } } return 0; }

1 0

Eric Pouech : cmd: Improve return code / errorlevel handling.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 61a1b87b85e74618242b6f066d1ffd05630cb453 URL: https://gitlab.winehq.org/wine/wine/-/commit/61a1b87b85e74618242b6f066d1ffd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 31 10:40:34 2024 +0200 cmd: Improve return code / errorlevel handling. Mainly for commands not setting ERRORLEVEL in case of failure. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 21 +++++++++++++-------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 ++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f350779a0db..17ef569dc3f 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); * a label to goto once opened. */ -void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandle) +RETURN_CODE WCMD_batch(const WCHAR *file, WCHAR *command, const WCHAR *startLabel, HANDLE pgmHandle) { HANDLE h = INVALID_HANDLE_VALUE; BATCH_CONTEXT *prev_context; @@ -54,7 +54,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandl if (h == INVALID_HANDLE_VALUE) { SetLastError (ERROR_FILE_NOT_FOUND); WCMD_print_error (); - return; + return ERROR_INVALID_FUNCTION; } } else { DuplicateHandle(GetCurrentProcess(), pgmHandle, @@ -106,9 +106,6 @@ void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandl } CloseHandle (h); - if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) - errorlevel = return_code; - /* * If there are outstanding setlocal's to the current context, unwind them. */ @@ -124,6 +121,8 @@ void WCMD_batch (WCHAR *file, WCHAR *command, WCHAR *startLabel, HANDLE pgmHandl free(context->batchfileW); LocalFree(context); context = prev_context; + + return return_code; } /******************************************************************* @@ -658,6 +657,7 @@ extern void WCMD_expand(const WCHAR *, WCHAR *); */ RETURN_CODE WCMD_call(WCHAR *command) { + RETURN_CODE return_code; WCHAR buffer[MAXSTRING]; WCMD_expand(command, buffer); @@ -666,7 +666,9 @@ RETURN_CODE WCMD_call(WCHAR *command) { WCMD_run_program(buffer, TRUE); /* If the thing we try to run does not exist, call returns 1 */ - if (errorlevel) errorlevel = ERROR_INVALID_FUNCTION; + if (errorlevel == RETURN_CODE_CANT_LAUNCH) + errorlevel = ERROR_INVALID_FUNCTION; + return_code = errorlevel; } else if (context) { @@ -685,11 +687,14 @@ RETURN_CODE WCMD_call(WCHAR *command) li.u.LowPart = SetFilePointer(context->h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); WCMD_batch(context->batchfileW, buffer, gotoLabel, context->h); + return_code = errorlevel; SetFilePointer(context->h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); /* Restore the for loop context */ WCMD_restore_for_loop_context(); - } else + } else { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); - return errorlevel ? ERROR_INVALID_FUNCTION : NO_ERROR; + return_code = ERROR_INVALID_FUNCTION; + } + return return_code; } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c778e6bae5b..f79645495b3 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -160,7 +160,7 @@ typedef int RETURN_CODE; #define RETURN_CODE_OLD_CHAINING (-999998) void WCMD_assoc (const WCHAR *, BOOL); -void WCMD_batch(WCHAR *, WCHAR *, WCHAR *, HANDLE); +RETURN_CODE WCMD_batch(const WCHAR *, WCHAR *, const WCHAR *, HANDLE); RETURN_CODE WCMD_call(WCHAR *command); void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7c19011f664..0f4c3ae8e3f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1592,14 +1592,18 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Special case BAT and CMD */ if (ext && (!wcsicmp(ext, L".bat") || !wcsicmp(ext, L".cmd"))) { + RETURN_CODE return_code; BOOL oldinteractive = interactive; + interactive = FALSE; - WCMD_batch(thisDir, command, NULL, INVALID_HANDLE_VALUE); + return_code = WCMD_batch(thisDir, command, NULL, INVALID_HANDLE_VALUE); interactive = oldinteractive; if (context && !called) { TRACE("Batch completed, but was not 'called' so skipping outer batch too\n"); context->skip_rest = TRUE; } + if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) + errorlevel = return_code; return; } else { DWORD exit_code; @@ -3713,8 +3717,10 @@ RETURN_CODE node_execute(CMD_NODE *node) case CMD_ONFAILURE: return_code = node_execute(node->left); return_code = temp_fixup_return_code(node->left, return_code, ERROR_INVALID_FUNCTION); - if (return_code != NO_ERROR) + if (return_code != NO_ERROR && return_code != RETURN_CODE_ABORTED) { + /* that's needed for commands (POPD, RMDIR) that don't set errorlevel in case of failure. */ + errorlevel = return_code; return_code = node_execute(node->right); temp_fixup_return_code(node->right, return_code, 0 /* not used */); }

1 0

Eric Pouech : cmd: Set success/failure return_code for POPD command.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: bec2a9fa340b6ae0410ec8ce89405684514057d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bec2a9fa340b6ae0410ec8ce894056… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 13:09:08 2024 +0200 cmd: Set success/failure return_code for POPD command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 ++++-- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6e0a7830900..9771511322c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1929,17 +1929,19 @@ RETURN_CODE WCMD_pushd(const WCHAR *args) * Pop a directory from the stack */ -void WCMD_popd (void) { +RETURN_CODE WCMD_popd(void) +{ struct env_stack *temp = pushd_directories; if (!pushd_directories) - return; + return ERROR_INVALID_FUNCTION; /* pop the old environment from the stack, and make it the current dir */ pushd_directories = temp->next; SetCurrentDirectoryW(temp->strings); LocalFree (temp->strings); LocalFree (temp); + return NO_ERROR; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dc2288742da..501b27af725 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -513,7 +513,7 @@ SUCCESS 0 SUCCESS 0 FAILURE 1 SUCCESS 666 -(a)todo_wine@FAILURE 1 +FAILURE 1 ERRORLEVEL 666 --- success/failure for DIR command FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index f79645495b3..9e10069cdac 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -186,7 +186,7 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); -void WCMD_popd (void); +RETURN_CODE WCMD_popd(void); void WCMD_print_error (void); RETURN_CODE WCMD_pushd(const WCHAR *args); void WCMD_remove_dir (WCHAR *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0f4c3ae8e3f..2a814cfe7b0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1916,7 +1916,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_pushd(parms_start); break; case WCMD_POPD: - WCMD_popd(); + return_code = WCMD_popd(); break; case WCMD_ASSOC: WCMD_assoc(parms_start, TRUE);

1 0