From: Francis De Brabandere <francisdb@gmail.com> Boolean keys were rejected outright by the hash function, returning E_NOTIMPL, so Exists and Remove failed for them. An uninitialized or comparison-result VBScript value can be a Boolean, so a script can end up using one as a dictionary key. Hash it by its numeric value like the other numeric types, so True and False match the equal numeric value across types (and False matches an Empty key). --- dlls/scrrun/dictionary.c | 5 +++++ dlls/scrrun/tests/dictionary.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 8137855b592..def6a3684ed 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -119,6 +119,7 @@ static inline BOOL is_numeric_key(const VARIANT *key) case VT_DATE: case VT_R4: case VT_R8: + case VT_BOOL: return TRUE; default: return FALSE; @@ -979,6 +980,10 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_R8|VT_BYREF: case VT_R8: return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); + case VT_BOOL|VT_BYREF: + case VT_BOOL: + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_BOOLREF(key) : V_BOOL(key)); + break; case VT_EMPTY: case VT_NULL: V_I4(hash) = 0; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 8da22a24101..8ff452079de 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -832,17 +832,17 @@ if (0) { /* crashes on native */ V_BOOL(&key) = VARIANT_FALSE; V_I4(&hash) = 5678; hr = IDictionary_get_HashVal(dict, &key, &hash); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); - todo_wine ok(V_I4(&hash) == get_num_hash(0.0f), "Unexpected hash value %#lx.\n", V_I4(&hash)); + ok(V_I4(&hash) == get_num_hash(0.0f), "Unexpected hash value %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_BOOL; V_BOOL(&key) = VARIANT_TRUE; V_I4(&hash) = 5678; hr = IDictionary_get_HashVal(dict, &key, &hash); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&hash) == VT_I4, "Unexpected hash type %d.\n", V_VT(&hash)); - todo_wine ok(V_I4(&hash) == get_num_hash((FLOAT)VARIANT_TRUE), "Unexpected hash value %#lx.\n", V_I4(&hash)); + ok(V_I4(&hash) == get_num_hash((FLOAT)VARIANT_TRUE), "Unexpected hash value %#lx.\n", V_I4(&hash)); V_VT(&key) = VT_EMPTY; V_I4(&key) = 1234; @@ -1269,19 +1269,19 @@ static void test_bool_key(void) V_BOOL(&a) = VARIANT_TRUE; V_VT(&b) = VT_I2; V_I2(&b) = -1; - todo_wine ok(keys_match(&a, &b), "True should match I2 -1\n"); + ok(keys_match(&a, &b), "True should match I2 -1\n"); V_VT(&a) = VT_BOOL; V_BOOL(&a) = VARIANT_FALSE; V_VT(&b) = VT_I2; V_I2(&b) = 0; - todo_wine ok(keys_match(&a, &b), "False should match I2 0\n"); + ok(keys_match(&a, &b), "False should match I2 0\n"); /* False is the zero/default value, so it matches an Empty key. */ V_VT(&a) = VT_BOOL; V_BOOL(&a) = VARIANT_FALSE; V_VT(&b) = VT_EMPTY; - todo_wine ok(keys_match(&a, &b), "False should match Empty\n"); + ok(keys_match(&a, &b), "False should match Empty\n"); /* True and False are distinct keys. */ V_VT(&a) = VT_BOOL; @@ -1306,11 +1306,11 @@ static void test_bool_key(void) V_BOOL(&b) = VARIANT_TRUE; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &b, &exists); - todo_wine ok(hr == S_OK, "Exists with Boolean key: %#lx.\n", hr); - todo_wine ok(exists == VARIANT_TRUE, "True should find I2 -1, got %x\n", exists); + ok(hr == S_OK, "Exists with Boolean key: %#lx.\n", hr); + ok(exists == VARIANT_TRUE, "True should find I2 -1, got %x\n", exists); hr = IDictionary_Remove(dict, &b); - todo_wine ok(hr == S_OK, "Remove with Boolean key: %#lx.\n", hr); + ok(hr == S_OK, "Remove with Boolean key: %#lx.\n", hr); IDictionary_Release(dict); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10960