- Wine-Commits - list.winehq.org

Victor Chiletto : vkd3d-shader/hlsl: Support expressions as register offsets.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: e13eb64d4c8d2b04f194e832153c3be95a5a3a60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e13eb64d4c8d2b04f194e832153c3… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Support expressions as register offsets. --- libs/vkd3d-shader/hlsl.y | 94 ++++++++++++++++++++-- .../hlsl/register-reservations-numeric.shader_test | 24 +++--- tests/hlsl/register-reservations-space.shader_test | 4 +- 3 files changed, 101 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9c75c87d..54227041 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1214,12 +1214,23 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl return true; } -static bool parse_reservation_index(const char *string, char *type, uint32_t *index) +static bool parse_reservation_index(const char *string, char *type, uint32_t *index, unsigned int bracket_offset) { - if (!sscanf(string + 1, "%u", index)) - return false; + char *endptr; *type = ascii_tolower(string[0]); + + if (string[1] == '\0') + { + *index = bracket_offset; + return true; + } + + *index = strtoul(string + 1, &endptr, 10) + bracket_offset; + + if (endptr == string + 1) + return false; + return true; } @@ -6545,22 +6556,35 @@ register_reservation: ':' KW_REGISTER '(' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index)) + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, 0)) + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + + vkd3d_free($4); + } + | ':' KW_REGISTER '(' any_identifier '[' expr ']' ')' + { + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $6, &@6))) + { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); + } vkd3d_free($4); + vkd3d_free($6); } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) { hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); } else if (parse_reservation_space($6, &$$.reg_space)) { - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index)) + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, 0)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); } @@ -6573,12 +6597,47 @@ register_reservation: vkd3d_free($4); vkd3d_free($6); } + | ':' KW_REGISTER '(' any_identifier '[' expr ']' ',' any_identifier ')' + { + memset(&$$, 0, sizeof($$)); + + if (!parse_reservation_space($9, &$$.reg_space)) + hlsl_error(ctx, &@9, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register space reservation '%s'.", $9); + + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $6, &@6))) + { + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + } + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($9); + } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier '[' expr ']' ')' + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); + + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $8, &@8))) + { + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $6); + } + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($8); + } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ',' any_identifier ')' { hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6590,6 +6649,27 @@ register_reservation: vkd3d_free($6); vkd3d_free($8); } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier '[' expr ']' ',' any_identifier ')' + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); + + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $8, &@8))) + { + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $6); + } + + if (!parse_reservation_space($11, &$$.reg_space)) + hlsl_error(ctx, &@11, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register space reservation '%s'.", $11); + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($8); + vkd3d_free($11); + } packoffset_reservation: ':' KW_PACKOFFSET '(' any_identifier ')' diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index a87a3652..a6d7e087 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -296,7 +296,7 @@ uniform 0 float 1.0 todo(glsl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader todo] +[pixel shader] // Numeric expr, no offset in the identifier. DXC ignores this. float a : register (c[1 + 1 * 2 * 0]); @@ -308,11 +308,11 @@ float4 main() : sv_target [test] uniform 0 float 1.0 uniform 4 float 2.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) -[pixel shader todo] +[pixel shader] // Numeric expr. DXC also ignores this. float a : register (c0[1 + 1 * 2 * 0]); @@ -324,11 +324,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo] +[pixel shader] // Float offsets truncate. float a : register (c0[0.6 + 0.6]); @@ -340,11 +340,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo] +[pixel shader] // Booleans are interpreted as integers in the usual way. float a : register (c0[true + false * true]); @@ -356,11 +356,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] // Negative offsets. DXC fails to compile this. float a : register (c2[-1]); @@ -371,7 +371,7 @@ float4 main() : sv_target [test] uniform 4 float 1.0 -todo draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Weird FXC behavior. @@ -484,7 +484,7 @@ size (2d, 1, 2) [require] shader model >= 4.0 -[pixel shader todo] +[pixel shader] Texture2D tex : register(t[1]); sampler sam : register(s[1]); @@ -494,6 +494,6 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test index 71644e5e..fe42b100 100644 --- a/tests/hlsl/register-reservations-space.shader_test +++ b/tests/hlsl/register-reservations-space.shader_test @@ -30,7 +30,7 @@ todo(glsl) draw quad probe (0, 0) rgba (1, 1, 1, 99) % Bracket syntax for registers. Ignored in SM>=6. -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t[1], space0); float4 main() : sv_target @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +todo(glsl) draw quad if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) if(sm<6) probe (0, 0) rgba (1, 1, 1, 99)

1 0

Victor Chiletto : tests: Add more register reservations tests.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: d11c7770926c019920b26b08746289b82f3231cb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d11c7770926c019920b26b0874628… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 tests: Add more register reservations tests. --- .../hlsl/register-reservations-numeric.shader_test | 220 +++++++++++++++++++++ .../hlsl/register-reservations-profile.shader_test | 30 +++ tests/hlsl/register-reservations-space.shader_test | 27 +++ 3 files changed, 277 insertions(+) diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index 1f32aa43..a87a3652 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -277,3 +277,223 @@ float4 main() : sv_target f += i; return f; } + +% Expressions as offsets. +[require] +% All shader models. + +[pixel shader] +// no offset at all, implicitly c0. +float a : register (c); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo(glsl) draw quad +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) + +[pixel shader todo] +// Numeric expr, no offset in the identifier. DXC ignores this. +float a : register (c[1 + 1 * 2 * 0]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +uniform 4 float 2.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) +if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) + +[pixel shader todo] +// Numeric expr. DXC also ignores this. +float a : register (c0[1 + 1 * 2 * 0]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo] +// Float offsets truncate. +float a : register (c0[0.6 + 0.6]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo] +// Booleans are interpreted as integers in the usual way. +float a : register (c0[true + false * true]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader fail(sm>=6) todo] +// Negative offsets. DXC fails to compile this. +float a : register (c2[-1]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 4 float 1.0 +todo draw quad +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) + +% Weird FXC behavior. +% SM4 accepts anything for 'b' reservations and discards it silently for global numeric variables. + +[pixel shader fail(sm<4 | sm>=6) todo(sm>=4)] +float a : register(banana); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo(glsl | sm>=4 | sm<6) draw quad +probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) + +% Testing other reservation types. This is a parse failure, i.e "X3530: register sa not valid" + +[pixel shader fail] + +sampler s : register(samply); + +float4 main() : sv_target +{ + return tex2D(s, float2(0, 0)); +} + +% This seems to parse fine, but fails with a different error message: "X3530: sampler requires an 's' or 't' register". +% Resource types probably have extra validation. + +[pixel shader fail] + +sampler s : register(banana); + +float4 main() : sv_target +{ + return tex2D(s, float2(0, 0)); +} + +% Trailing characters after the reservation index are okay in SM < 6, except for 'b' reservations + +[pixel shader fail(sm>=6)] + +float a : register(c1manymanyletters); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 2.0 +todo(glsl) draw quad +probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) + +[require] +shader model >= 4.0 + +[pixel shader fail todo] + +cbuffer buf : register(b0manymanyletters) +{ + float a; +} + +float4 main() : sv_target +{ + return a; +} + +% SM4 fails, but not during parsing: it tries to reserve slot 4294967295 (i.e UINT_MAX) for the constant buffer. +% It'll attempt to reserve the same slot even if an offset is passed in brackets, which suggests it uses -1 +% as a "parsing failure" flag. + +% DXC fails during parsing. + +[pixel shader fail] +cbuffer buf : register(banana) +{ + float a; +} + +float4 main() : sv_target +{ + return a; +} + +% Some versions of fxc's SM5.1 completely ignore bracket exprs for samplers and textures. +% This was fixed (?) in later versions. + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[sampler 1] +filter point point point +address clamp clamp clamp + +[srv 0] +size (2d, 1, 2) +0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0 + +[srv 1] +size (2d, 1, 2) +1.0 1.0 1.0 1.0 2.0 2.0 2.0 2.0 + +[require] +shader model >= 4.0 + +[pixel shader todo] +Texture2D tex : register(t[1]); +sampler sam : register(s[1]); + +float4 main() : sv_target +{ + return tex.Sample(sam, float2(0, 0.5)); +} + +[test] +todo(sm<6) draw quad +if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) +if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/register-reservations-profile.shader_test b/tests/hlsl/register-reservations-profile.shader_test index a747ea6d..8b052231 100644 --- a/tests/hlsl/register-reservations-profile.shader_test +++ b/tests/hlsl/register-reservations-profile.shader_test @@ -259,3 +259,33 @@ float4 main() : sv_target [test] todo(sm<6) draw quad probe (0, 0) rgba (1, 1, 1, 99) + +% Bracket exprs should still parse correctly. + +[pixel shader todo] +Texture2D tex1 : register(ps, t[1]); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba(0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba(1, 1, 1, 99) + +% This works, though the bind point is ignored. + +[pixel shader fail(sm>=6) todo(sm<6)] +float a : register(ps[5], c1); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo draw quad +probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test index 48fac6f4..71644e5e 100644 --- a/tests/hlsl/register-reservations-space.shader_test +++ b/tests/hlsl/register-reservations-space.shader_test @@ -29,6 +29,19 @@ float4 main() : sv_target todo(glsl) draw quad probe (0, 0) rgba (1, 1, 1, 99) +% Bracket syntax for registers. Ignored in SM>=6. +[pixel shader todo] +Texture2D tex1 : register(t[1], space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail(sm>=6)] Texture2D tex1 : register(t1, sPaCe0); @@ -94,6 +107,20 @@ todo(sm<6) draw quad if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) if(sm<6) probe (0,0) rgba (1, 1, 1, 99) +% Same as above, but with bracket exprs, which are ignored in SM>=6. + +[pixel shader todo] +Texture2D tex1 : register(vs, t[1], space0) : register(ps, t[2], space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba (1, 1, 1, 99) % This actually inheres to 5.1+; it doesn't matter whether "space" is specified.

1 0

Fabian Maurer : d3dx9: Remove superflous nullcheck (coverity).
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: a28ffff33c8ac3cca75fb8cacd1984b3d42a22b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a28ffff33c8ac3cca75fb8cacd1984… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 30 15:47:11 2024 +0200 d3dx9: Remove superflous nullcheck (coverity). Since we return when the factory creation fails, it can't be null here --- dlls/d3dx9_36/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 5044feb0fb6..da23047534b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -932,7 +932,7 @@ static HRESULT d3dx_initialize_image_from_wic(const void *src_data, uint32_t src IWICBitmapFrameDecode *bitmap_frame = NULL; IWICBitmapDecoder *bitmap_decoder = NULL; uint32_t src_image_size = src_data_size; - IWICImagingFactory *wic_factory = NULL; + IWICImagingFactory *wic_factory; const void *src_image = src_data; WICPixelFormatGUID pixel_format; IWICStream *wic_stream = NULL; @@ -1032,8 +1032,7 @@ exit: IWICBitmapDecoder_Release(bitmap_decoder); if (wic_stream) IWICStream_Release(wic_stream); - if (wic_factory) - IWICImagingFactory_Release(wic_factory); + IWICImagingFactory_Release(wic_factory); return hr; }

1 0

Alex Henrie : wineboot: Correct size argument to SetupDiSetDeviceRegistryPropertyA.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: cb866902ec4a3ec19bd9966412fa82de7071841d URL: https://gitlab.winehq.org/wine/wine/-/commit/cb866902ec4a3ec19bd9966412fa82… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jul 5 09:26:57 2024 -0600 wineboot: Correct size argument to SetupDiSetDeviceRegistryPropertyA. --- programs/wineboot/wineboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index dfa3f6dd738..134d7eeffc7 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1498,7 +1498,7 @@ static void install_root_pnp_devices(void) } if (!SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_HARDWAREID, - (const BYTE *)root_devices[i].hardware_id, (strlen(root_devices[i].hardware_id) + 2) * sizeof(WCHAR))) + (const BYTE *)root_devices[i].hardware_id, strlen(root_devices[i].hardware_id) + 2)) { WINE_ERR("Failed to set hardware id for %s, error %#lx.\n", debugstr_a(root_devices[i].name), GetLastError()); continue;

1 0

Stefan Dösinger : ddraw: Set dwMaxVertexCount to 2048.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 6f2466ea0c20245955d0d2b13b5162a1fe62815b URL: https://gitlab.winehq.org/wine/wine/-/commit/6f2466ea0c20245955d0d2b13b5162… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat May 18 13:34:46 2024 +0300 ddraw: Set dwMaxVertexCount to 2048. The bug has been fixed already by moving ddraw4 vertex buffers into system memory. Changing this value makes the game create a smaller buffer, which makes the game fast on video memory buffers. I think we should stay close to what Windows drivers report even though we mitigated the original issue in a different way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863 --- dlls/ddraw/ddraw.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5cea4677439..ed342bfd708 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1231,8 +1231,36 @@ void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) caps1->dpcTriCaps = caps7->dpcTriCaps; caps1->dwDeviceRenderBitDepth = caps7->dwDeviceRenderBitDepth; caps1->dwDeviceZBufferBitDepth = caps7->dwDeviceZBufferBitDepth; + + /* This value is zero on all Windows drivers we have seen so far. */ caps1->dwMaxBufferSize = 0; - caps1->dwMaxVertexCount = 65536; + + /* AMD GPUs on Windows XP and newer report 1024 for HAL devices. + * Nvidia GPUs report 65534. On Windows 9x we have seen 2048 on + * AMD cards and 32768 on Nvidia. The API defined limit is 65536 + * because ddraw only supports 16 bit indices. + * + * Some games, for example Prince of Persia 3D (bug 44863), create a + * vertex buffer to hold as many vertices as we report here. The + * game requests a video memory buffer, maps it, writes a handful + * of vertices and draws. Because IDirect3DVertexBuffer::Lock does + * not allow passing a range, and prior to d3d7 doesn't support + * NOOVERWRITE/DISCARD, the upload becomes slow if the buffer is too + * large. So we don't want to report a value that's too high here. + * + * Why 2048? Windows 9x was the contemporaneous system when d3d 1-4 + * titles were written. + * + * Regardless of this value, we put ddraw4 vertex buffers into + * system memory because games are using them poorly. This mitigates + * negative effects of a large vertex count. + * + * Windows doesn't enforce this limit. A larger vertex buffer can + * be created and used in draws. More vertices than dwMaxVertexCount + * can be rendered in one draw call. SetExecuteData with a vertex + * count exceeding dwMaxVertexCount succeeds too. */ + caps1->dwMaxVertexCount = 2048; + caps1->dwMinTextureWidth = caps7->dwMinTextureWidth; caps1->dwMinTextureHeight = caps7->dwMinTextureHeight; caps1->dwMaxTextureWidth = caps7->dwMaxTextureWidth;

1 0

Eric Pouech : cmd: Set success/failure return code for LABEL command.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 759b1cd885a0bc1a0427f13de77cf4c7134a0920 URL: https://gitlab.winehq.org/wine/wine/-/commit/759b1cd885a0bc1a0427f13de77cf4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:42:38 2024 +0200 cmd: Set success/failure return code for LABEL command. And finish the separation for LABEL & VOLUME commands entry points. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 83 +++++++++++++++----------------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 42 insertions(+), 49 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 09d6ce631b8..a1cc66b8613 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3756,64 +3756,57 @@ BOOL WCMD_print_volume_information(const WCHAR *path) } /**************************************************************************** - * WCMD_volume + * WCMD_label * - * Display volume information (set_label = FALSE) - * Additionally set volume label (set_label = TRUE) - * Returns 1 on success, 0 otherwise + * Set volume label */ -int WCMD_old_volume(BOOL set_label, const WCHAR *path) +RETURN_CODE WCMD_label(void) { - DWORD count, serial; - WCHAR string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH]; - BOOL status; + DWORD count; + WCHAR string[MAX_PATH], curdir[MAX_PATH]; - if (!*path) { - status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); - if (!status) { - WCMD_print_error (); - return 0; + /* FIXME incomplete implementation: + * - no support for /MP qualifier, + * - no support for passing label as parameter + */ + if (*quals) + return errorlevel = ERROR_INVALID_FUNCTION; + if (!*param1) { + if (!GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir)) { + WCMD_print_error(); + return errorlevel = ERROR_INVALID_FUNCTION; } - status = GetVolumeInformationW(NULL, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); } - else { - if ((path[1] != ':') || (lstrlenW(path) != 2)) { + else if (param1[1] == ':' && !param1[2]) { + curdir[0] = param1[0]; + curdir[1] = param1[1]; + } else { WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - return 0; - } - wsprintfW (curdir, L"%s\\", path); - status = GetVolumeInformationW(curdir, label, ARRAY_SIZE(label), &serial, NULL, NULL, NULL, 0); - } - if (!status) { - WCMD_print_error (); - return 0; + return errorlevel = ERROR_INVALID_FUNCTION; } - if (label[0] != '\0') { - WCMD_output (WCMD_LoadMessage(WCMD_VOLUMELABEL), - curdir[0], label); + curdir[2] = L'\\'; + curdir[3] = L'\0'; + if (!WCMD_print_volume_information(curdir)) { + WCMD_print_error(); + return errorlevel = ERROR_INVALID_FUNCTION; } - else { - WCMD_output (WCMD_LoadMessage(WCMD_VOLUMENOLABEL), - curdir[0]); + + if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && + count > 1) { + string[count-1] = '\0'; /* ReadFile output is not null-terminatrred! */ + if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } - WCMD_output (WCMD_LoadMessage(WCMD_VOLUMESERIALNO), - HIWORD(serial), LOWORD(serial)); - if (set_label) { - WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - if (WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count) && - count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ - if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ - } - if (*path) { - if (!SetVolumeLabelW(curdir, string)) WCMD_print_error (); - } - else { - if (!SetVolumeLabelW(NULL, string)) WCMD_print_error (); + else return errorlevel = ERROR_INVALID_FUNCTION; + if (*param1) { + if (!SetVolumeLabelW(curdir, string)) + { + errorlevel = GetLastError(); + WCMD_print_error(); + return errorlevel; } } - return 1; + return errorlevel = NO_ERROR; } RETURN_CODE WCMD_volume(void) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6358d35ca49..1f52ec722b7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -564,8 +564,8 @@ SUCCESS 0 FAILURE 1 FAILURE 1 --- success/failure for LABEL command -(a)todo_wine@FAILURE 1 -(a)todo_wine@--- +FAILURE 1 +--- ------------ Testing 'set' ------------ 1 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3c1ebf0a2f0..433067f6b29 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -179,6 +179,7 @@ RETURN_CODE WCMD_exit(void); BOOL WCMD_get_fullpath(const WCHAR *, SIZE_T, WCHAR *, WCHAR **); void WCMD_give_help (const WCHAR *args); RETURN_CODE WCMD_goto(void); +RETURN_CODE WCMD_label(void); void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); RETURN_CODE WCMD_move (void); @@ -208,7 +209,6 @@ RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); RETURN_CODE WCMD_version(void); RETURN_CODE WCMD_volume(void); -int WCMD_old_volume (BOOL set_label, const WCHAR *args); void WCMD_mklink(WCHAR *args); WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 24da1d3630a..353e955b123 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1849,7 +1849,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_give_help (parms_start); break; case WCMD_LABEL: - WCMD_old_volume (TRUE, parms_start); + return_code = WCMD_label(); break; case WCMD_MD: case WCMD_MKDIR:

1 0

Piotr Caban : kernel32/tests: Fix CompareStringW test crash when linguistic compressions are used.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 8d8f1f90ca0a1069723fa24d850e3a3bbae6287b URL: https://gitlab.winehq.org/wine/wine/-/commit/8d8f1f90ca0a1069723fa24d850e3a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 5 18:17:00 2024 +0200 kernel32/tests: Fix CompareStringW test crash when linguistic compressions are used. The test crashes in Polish locale. --- dlls/kernel32/tests/locale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5760d7c9eb1..b418f97ddde 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2069,7 +2069,8 @@ static void test_CompareStringW(void) *str2 = 'B'; /* CompareStringW should abort on the first non-matching character */ - ret = CompareStringW(LOCALE_USER_DEFAULT, 0, str1, 100, str2, 100); + ret = CompareStringW(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + 0, str1, 100, str2, 100); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); success = VirtualFree(buf, 0, MEM_RELEASE);

1 0

Eric Pouech : cmd: Set success/failure return code for SETLOCAL/ENDLOCAL commands.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: ab1782fc86687492361621ee72e6beaa9e6d34f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab1782fc86687492361621ee72e6be… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 18:56:38 2024 +0200 cmd: Set success/failure return code for SETLOCAL/ENDLOCAL commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 49 +++++++++++++++++++------------- programs/cmd/tests/test_builtins.cmd.exp | 8 +++--- programs/cmd/wcmd.h | 4 +-- programs/cmd/wcmdmain.c | 4 +-- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index febf6ba94b6..bf089a8b9f5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2298,33 +2298,40 @@ static WCHAR *WCMD_dupenv( const WCHAR *env ) * setlocal pushes the environment onto a stack * Save the environment as unicode so we don't screw anything up. */ -void WCMD_setlocal (const WCHAR *s) { +RETURN_CODE WCMD_setlocal(WCHAR *args) +{ WCHAR *env; struct env_stack *env_copy; WCHAR cwd[MAX_PATH]; BOOL newdelay; + int argno = 0; + WCHAR *argN = args; /* setlocal does nothing outside of batch programs */ - if (!context) return; - - /* DISABLEEXTENSIONS ignored */ - - /* ENABLEDELAYEDEXPANSION / DISABLEDELAYEDEXPANSION could be parm1 or parm2 - (if both ENABLEEXTENSIONS and ENABLEDELAYEDEXPANSION supplied for example) */ - if (!wcsicmp(param1, L"ENABLEDELAYEDEXPANSION") || !wcsicmp(param2, L"ENABLEDELAYEDEXPANSION")) { - newdelay = TRUE; - } else if (!wcsicmp(param1, L"DISABLEDELAYEDEXPANSION") || !wcsicmp(param2, L"DISABLEDELAYEDEXPANSION")) { - newdelay = FALSE; - } else { - newdelay = delayedsubst; + if (!context) + return NO_ERROR; + newdelay = delayedsubst; + while (argN) + { + WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE); + if (!thisArg || !*thisArg) break; + if (!wcsicmp(thisArg, L"ENABLEDELAYEDEXPANSION")) + newdelay = TRUE; + else if (!wcsicmp(thisArg, L"DISABLEDELAYEDEXPANSION")) + newdelay = FALSE; + /* ENABLE/DISABLE EXTENSIONS ignored for now */ + else if (!wcsicmp(thisArg, L"ENABLEEXTENSIONS") || !wcsicmp(thisArg, L"DISABLEEXTENSIONS")) + {} + else + return errorlevel = ERROR_INVALID_FUNCTION; + TRACE("Setting delayed expansion to %d\n", newdelay); } - WINE_TRACE("Setting delayed expansion to %d\n", newdelay); env_copy = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); if( !env_copy ) { - WINE_ERR ("out of memory\n"); - return; + ERR("out of memory\n"); + return errorlevel = ERROR_OUTOFMEMORY; } env = GetEnvironmentStringsW (); @@ -2345,7 +2352,7 @@ void WCMD_setlocal (const WCHAR *s) { LocalFree (env_copy); FreeEnvironmentStringsW (env); - + return errorlevel = NO_ERROR; } /***************************************************************************** @@ -2355,18 +2362,19 @@ void WCMD_setlocal (const WCHAR *s) { * Note: When searching for '=', search from WCHAR position 1, to handle * special internal environment variables =C:, =D: etc */ -void WCMD_endlocal (void) { +RETURN_CODE WCMD_endlocal(void) +{ WCHAR *env, *old, *p; struct env_stack *temp; int len, n; /* setlocal does nothing outside of batch programs */ - if (!context) return; + if (!context) return NO_ERROR; /* setlocal needs a saved environment from within the same context (batch program) as it was saved in */ if (!saved_environment || saved_environment->batchhandle != context->h) - return; + return ERROR_INVALID_FUNCTION; /* pop the old environment from the stack */ temp = saved_environment; @@ -2419,6 +2427,7 @@ void WCMD_endlocal (void) { LocalFree (env); LocalFree (temp); + return NO_ERROR; } /***************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 75152663850..c883758cf32 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -536,11 +536,11 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 --- success/failure for SETLOCAL/ENDLOCAL commands -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 +FAILURE 1 +SUCCESS 0 SUCCESS 666 @todo_wine(a)SUCCESS@space@ -(a)todo_wine@SUCCESS 0 +SUCCESS 0 --- success/failure for DATE command @todo_wine(a)SUCCESS 0 @todo_wine(a)FAILURE 1 @@ -739,7 +739,7 @@ foo bar(a)or_broken@foo gotitright 33 -(a)todo_wine@0(a)or_broken@1 +0(a)or_broken@1 foo !WINE_FOO! not empty diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5f51a4e1f3a..3c259ec0eb9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -171,7 +171,7 @@ RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); RETURN_CODE WCMD_directory(WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); -void WCMD_endlocal (void); +RETURN_CODE WCMD_endlocal(void); void WCMD_enter_paged_mode(const WCHAR *); RETURN_CODE WCMD_exit(void); BOOL WCMD_get_fullpath(const WCHAR *, SIZE_T, WCHAR *, WCHAR **); @@ -192,7 +192,7 @@ RETURN_CODE WCMD_pushd(const WCHAR *args); RETURN_CODE WCMD_remove_dir(WCHAR *command); RETURN_CODE WCMD_rename(void); void WCMD_run_program (WCHAR *command, BOOL called); -void WCMD_setlocal (const WCHAR *args); +RETURN_CODE WCMD_setlocal(WCHAR *args); void WCMD_setshow_date (void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); void WCMD_setshow_env (WCHAR *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ce48b16d7ec..feb5e75281e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1878,10 +1878,10 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_remove_dir(parms_start); break; case WCMD_SETLOCAL: - WCMD_setlocal(parms_start); + return_code = WCMD_setlocal(parms_start); break; case WCMD_ENDLOCAL: - WCMD_endlocal(); + return_code = WCMD_endlocal(); break; case WCMD_SET: WCMD_setshow_env (parms_start);

1 0

Eric Pouech : cmd: Set success/failure return code for VER command.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 879b48490d914e01f5330359cdaa131a639fc63d URL: https://gitlab.winehq.org/wine/wine/-/commit/879b48490d914e01f5330359cdaa13… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 11 09:26:16 2024 +0200 cmd: Set success/failure return code for VER command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 18 +++++++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 5 ++--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 843274b7969..e2c64221bb2 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3724,10 +3724,22 @@ void WCMD_verify (const WCHAR *args) { * Display version info. */ -void WCMD_version (void) { - - WCMD_output_asis (version_string); +RETURN_CODE WCMD_version(void) +{ + RETURN_CODE return_code; + WCMD_output_asis(L"\r\n"); + if (*quals) + { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); + return_code = ERROR_INVALID_FUNCTION; + } + else + { + WCMD_output_asis(version_string); + return_code = NO_ERROR; + } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4d84079f6d4..fc968a6d0a0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -551,9 +551,9 @@ FAILURE 1 @todo_wine(a)SUCCESS 666 @todo_wine(a)SUCCESS 666 --- success/failure for VER command -(a)todo_wine@SUCCESS 0 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 +SUCCESS 0 +SUCCESS 0 +FAILURE 1 --- success/failure for VERIFY command @todo_wine(a)SUCCESS 0 @todo_wine(a)SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index edcd6dce56e..62c07af021f 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -204,7 +204,7 @@ void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); void WCMD_verify (const WCHAR *args); -void WCMD_version (void); +RETURN_CODE WCMD_version(void); int WCMD_volume (BOOL set_label, const WCHAR *args); void WCMD_mklink(WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 84692121d8b..817400aec0e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1903,8 +1903,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_type(parms_start); break; case WCMD_VER: - WCMD_output_asis(L"\r\n"); - WCMD_version (); + return_code = WCMD_version(); break; case WCMD_VERIFY: WCMD_verify (parms_start); @@ -4181,7 +4180,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) */ interactive = TRUE; - if (!opt_k) WCMD_version (); + if (!opt_k) WCMD_output_asis(version_string); if (echo_mode) WCMD_output_asis(L"\r\n"); /* 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)

1 0

Eric Pouech : cmd: Set success/failure return code for VERIFY command.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 31492f6bd9f2c9272fe8b7f3f71e269d63f537bb URL: https://gitlab.winehq.org/wine/wine/-/commit/31492f6bd9f2c9272fe8b7f3f71e26… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 11 09:21:14 2024 +0200 cmd: Set success/failure return code for VERIFY command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 35 +++++++++++++++----------------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e2c64221bb2..2f6e34f6172 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3697,25 +3697,22 @@ void WCMD_more (WCHAR *args) { * it... */ -void WCMD_verify (const WCHAR *args) { - - int count; - - count = lstrlenW(args); - if (count == 0) { - if (verify_mode) WCMD_output(WCMD_LoadMessage(WCMD_VERIFYPROMPT), L"ON"); - else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYPROMPT), L"OFF"); - return; - } - if (lstrcmpiW(args, L"ON") == 0) { - verify_mode = TRUE; - return; - } - else if (lstrcmpiW(args, L"OFF") == 0) { - verify_mode = FALSE; - return; - } - else WCMD_output_stderr(WCMD_LoadMessage(WCMD_VERIFYERR)); +RETURN_CODE WCMD_verify(void) +{ + RETURN_CODE return_code = NO_ERROR; + + if (!param1[0]) + WCMD_output(WCMD_LoadMessage(WCMD_VERIFYPROMPT), verify_mode ? L"ON" : L"OFF"); + else if (lstrcmpiW(param1, L"ON") == 0) + verify_mode = TRUE; + else if (lstrcmpiW(param1, L"OFF") == 0) + verify_mode = FALSE; + else + { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_VERIFYERR)); + return_code = ERROR_INVALID_FUNCTION; + } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fc968a6d0a0..2b6f735c4ba 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -555,9 +555,9 @@ SUCCESS 0 SUCCESS 0 FAILURE 1 --- success/failure for VERIFY command -(a)todo_wine@SUCCESS 0 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 +SUCCESS 0 +SUCCESS 0 +FAILURE 1 --- success/failure for VOL command @todo_wine(a)SUCCESS 0 @todo_wine(a)SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 62c07af021f..60504cdc3fe 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -203,7 +203,7 @@ void WCMD_shift (const WCHAR *args); void WCMD_start (WCHAR *args); void WCMD_title (const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); -void WCMD_verify (const WCHAR *args); +RETURN_CODE WCMD_verify(void); RETURN_CODE WCMD_version(void); int WCMD_volume (BOOL set_label, const WCHAR *args); void WCMD_mklink(WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 817400aec0e..7ede9ae09ab 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1906,7 +1906,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_version(); break; case WCMD_VERIFY: - WCMD_verify (parms_start); + return_code = WCMD_verify(); break; case WCMD_VOL: WCMD_volume (FALSE, parms_start);

1 0