RegDeleteTree [3rd]

[Paul Vriens]

Stefan Leichter wrote:
> Am Saturday 21 April 2007 20:13 schrieb Paul Vriens:
>> Hi Stefan
>>
>> the results:
>>
>> registry.c:576:test_query_value_ex: type set to: 0x0022fe78
>> registry.c:1163: Test failed: Expected ERROR_SUCCESS, got 6
>> registry: 293 tests executed (0 marked as todo, 1 failure), 0 skipped.
>>
>> That's because you're doing a RegSetValueA on a just-closed handle.
> Hello Paul,
> 
> can you retry with the attached patch.
> 
> Thank you
> Stefan
> 
> 
> ------------------------------------------------------------------------
> 
> --- ../wine-git/dlls/advapi32/tests/registry.c	2007-04-18 18:45:08.000000000 +0200
> +++ dlls/advapi32/tests/registry.c	2007-04-21 22:19:15.000000000 +0200
> @@ -1151,15 +1151,33 @@
>      ok(!RegQueryValueA(subkey, NULL, buffer, &size),
>          "Default value of subkey not longer present\n");
>  
> +    ret = RegCreateKeyA(subkey, "subkey2", &subkey2);
> +    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
> +    ret = RegCloseKey(subkey2);
> +    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
> +    ret = RegCreateKeyA(subkey, "subkey3", &subkey2);
> +    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
> +    ret = RegCloseKey(subkey2);
> +    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
> +    ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5);
> +    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
>      ret = pRegDeleteTreeA(subkey, NULL);
>      ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
>      ok(!RegOpenKeyA(hkey_main, "subkey", &subkey),
>          "subkey was deleted\n");
> +    ok(RegOpenKeyA(subkey, "subkey2", &subkey2),
> +        "subkey2 was not deleted\n");
> +    ok(RegOpenKeyA(subkey, "subkey3", &subkey2),
> +        "subkey3 was not deleted\n");
> +    size = MAX_PATH;
>      ret = RegQueryValueA(subkey, NULL, buffer, &size);
>      ok(ret == ERROR_SUCCESS,
>          "Default value of subkey is not present\n");
>      ok(!lstrlenA(buffer),
>          "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer);
> +    size = MAX_PATH;
> +    ok(RegQueryValueA(subkey, "value", buffer, &size),
> +        "Value is still present\n");
>  
>      ret = pRegDeleteTreeA(hkey_main, "not-here");
>      ok(ret == ERROR_FILE_NOT_FOUND,
Hi Stefan,

All fine this time:

registry.c:576:test_query_value_ex: type set to: 0x0022fe78
registry: 293 tests executed (0 marked as todo, 0 failures), 0 skipped.

(Seeing this output (mentioning line 576) and comparing this to the previous 
one, it seems the type value is not so random as stated in the comments of that 
test, I'll have a look if time permits).

Cheers,

Paul.