From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/rometadata/mdtables.c | 148 ++++++++++++++++++++++++++--- dlls/rometadata/tests/rometadata.c | 33 ++++--- include/corhdr.h | 10 ++ 3 files changed, 161 insertions(+), 30 deletions(-) diff --git a/dlls/rometadata/mdtables.c b/dlls/rometadata/mdtables.c index 0cb471fb3e4..773400457de 100644 --- a/dlls/rometadata/mdtables.c +++ b/dlls/rometadata/mdtables.c @@ -845,7 +845,7 @@ static HRESULT token_get_parent_typedef(IMetaDataImport *iface, mdToken token, t TRACE("(%p, %s, %p, %p)\n", iface, debugstr_mdToken(token), enum_func, parent); - assert(type == mdtMethodDef || type == mdtFieldDef); + assert(type == mdtMethodDef || type == mdtFieldDef || type == mdtProperty); *parent = mdTypeDefNil; hr = IMetaDataImport_EnumTypeDefs(iface, &typedef_enum, &cur_typedef, 1, NULL); @@ -957,11 +957,41 @@ static HRESULT WINAPI import_GetMemberRefProps(IMetaDataImport *iface, mdMemberR return E_NOTIMPL; } -static HRESULT WINAPI import_EnumProperties(IMetaDataImport *iface, HCORENUM *henum, mdTypeDef type_def, +static HRESULT WINAPI import_EnumProperties(IMetaDataImport *iface, HCORENUM *ret_henum, mdTypeDef type_def, mdProperty *props, ULONG len, ULONG *count) { - FIXME("(%p, %p, %#x, %p, %lu, %p): stub!\n", iface, henum, type_def, props, len, count); - return E_NOTIMPL; + struct metadata_tables *impl = impl_from_IMetaDataImport(iface); + ULONG num_propertymap_rows, i; + HRESULT hr; + + TRACE("(%p, %p, %s, %p, %lu, %p)\n", iface, ret_henum, debugstr_mdToken(type_def), props, len, count); + + if (count) *count = 0; + if (TypeFromToken(type_def) != mdtTypeDef || IsNilToken(type_def)) return S_FALSE; + + if (!*ret_henum) + { + if (FAILED((hr = table_get_num_rows(&impl->IMetaDataTables_iface, TABLE_PROPERTYMAP, &num_propertymap_rows)))) + return hr; + for (i = 1; i <= num_propertymap_rows; i++) + { + ULONG parent; + + hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_PROPERTYMAP, 0, i, &parent); + if (FAILED(hr)) return hr; + + if (parent == RidFromToken(type_def)) + { + hr = table_create_enum_from_token_list(&impl->IMetaDataTables_iface, TABLE_PROPERTYMAP, TABLE_PROPERTY, + i, 1, ret_henum); + if (hr != S_OK) return hr; + break; + } + } + if (!*ret_henum) return S_FALSE; + } + + return token_enum_get_entries(*ret_henum, mdtProperty, props, len, count); } static HRESULT WINAPI import_EnumEvents(IMetaDataImport *iface, HCORENUM *henum, mdTypeDef type_def, mdEvent *events, @@ -1253,17 +1283,109 @@ static HRESULT WINAPI import_GetFieldProps(IMetaDataImport *iface, mdFieldDef fi return (field_name && name_needed > name_len) ? CLDB_S_TRUNCATION : S_OK; } +static HRESULT property_get_parent_typedef(IMetaDataImport *iface, mdProperty property, mdTypeDef *parent) +{ + return token_get_parent_typedef(iface, property, iface->lpVtbl->EnumProperties, parent); +} + static HRESULT WINAPI import_GetPropertyProps(IMetaDataImport *iface, mdProperty prop, mdTypeDef *type_def, WCHAR *name, ULONG name_len, ULONG *name_written, ULONG *prop_flags, - const COR_SIGNATURE **sig_blob, ULONG *sig_len, ULONG *value_type_flag, - UVCP_CONSTANT *default_value, ULONG *value_len, mdMethodDef *set_method, - mdMethodDef *get_method, mdMethodDef *other_methods, ULONG other_len, - ULONG *other_count) -{ - FIXME("(%p, %#x, %p, %p, %lu, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %lu, %p): stub!\n", iface, prop, type_def, - name, name_len, name_written, prop_flags, sig_blob, sig_len, value_type_flag, default_value, value_len, - set_method, get_method, other_methods, other_len, other_count); - return E_NOTIMPL; + const COR_SIGNATURE **ret_sig_blob, ULONG *ret_sig_len, + ULONG *value_type_flag, UVCP_CONSTANT *default_value, ULONG *value_len, + mdMethodDef *ret_set_method, mdMethodDef *ret_get_method, + mdMethodDef *other_methods, ULONG other_len, ULONG *ret_other_count) +{ + ULONG flags = 0, sig_len = 0, name_needed = 0, val_len = 0, val_type = ELEMENT_TYPE_VOID, other_count = 0; + mdToken parent = mdTypeDefNil, get_method = mdMethodDefNil, set_method = mdMethodDefNil; + struct metadata_tables *impl = impl_from_IMetaDataImport(iface); + const BYTE *sig_blob = NULL, *val_blob = NULL; + HRESULT hr; + + TRACE("(%p, %s, %p, %p, %lu, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %lu, %p)\n", iface, debugstr_mdToken(prop), + type_def, name, name_len, name_written, prop_flags, ret_sig_blob, ret_sig_len, value_type_flag, default_value, + value_len, ret_set_method, ret_get_method, other_methods, other_len, ret_other_count); + + if (TypeFromToken(prop) != mdtProperty) return S_FALSE; + + if (name && name_len) + name[0] = L'\0'; + if (!IsNilToken(prop)) + { + ULONG name_idx, sig_idx, num_methodsemantics, semantic_row; + const ULONG row = RidFromToken(prop); + const char *nameA; + + if (FAILED((hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_PROPERTY, 0, row, &flags)))) + return hr; + if (FAILED((hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_PROPERTY, 1, row, &name_idx)))) + return hr; + if (FAILED((hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_PROPERTY, 2, row, &sig_idx)))) + return hr; + + if (FAILED((hr = IMetaDataTables_GetString(&impl->IMetaDataTables_iface, name_idx, &nameA)))) + return hr; + if (FAILED((hr = IMetaDataTables_GetBlob(&impl->IMetaDataTables_iface, sig_idx, &sig_len, &sig_blob)))) + return hr; + if (FAILED((hr = property_get_parent_typedef(&impl->IMetaDataImport_iface, prop, &parent)))) + return hr; + if (FAILED((hr = token_get_constant_value(&impl->IMetaDataImport_iface, prop, &val_type, &val_blob, &val_len)))) + return hr; + + if (FAILED((hr = table_get_num_rows(&impl->IMetaDataTables_iface, TABLE_METHODSEMANTICS, &num_methodsemantics)))) + return hr; + + for (semantic_row = 1; semantic_row <= num_methodsemantics; semantic_row++) + { + ULONG assoc_token, semantic, method; + + hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_METHODSEMANTICS, 2, semantic_row, + &assoc_token); + if (FAILED(hr)) return hr; + if (assoc_token != prop) continue; + hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_METHODSEMANTICS, 0, semantic_row, + &semantic); + if (FAILED(hr)) return hr; + hr = IMetaDataTables_GetColumn(&impl->IMetaDataTables_iface, TABLE_METHODSEMANTICS, 1, semantic_row, + &method); + if (FAILED(hr)) return hr; + if (IsNilToken(get_method) && semantic & msGetter) + get_method = TokenFromRid(method, mdtMethodDef); + else if (IsNilToken(set_method) && semantic & msSetter) + set_method = TokenFromRid(method, mdtMethodDef); + else if (other_methods && other_count < other_len && semantic & msOther) + other_methods[other_count++] = TokenFromRid(method, mdtMethodDef); + } + + name_needed = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0); + if (name && name_len) + { + ULONG n = MultiByteToWideChar(CP_ACP, 0, nameA, min(strlen(nameA), name_len - 1), name, name_len - 1); + name[n] = L'\0'; + } + } + if (type_def) + *type_def = parent; + if (name_written) + *name_written = name_needed; + if (prop_flags) + *prop_flags = flags; + if (ret_sig_blob) + *ret_sig_blob = sig_blob; + if (ret_sig_len) + *ret_sig_len = sig_len; + if (value_type_flag) + *value_type_flag = val_type; + if (default_value) + *default_value = (UVCP_CONSTANT)val_blob; + if (value_len) + *value_len = val_len; + if (ret_get_method) + *ret_get_method = get_method; + if (ret_set_method) + *ret_set_method = set_method; + if (ret_other_count) + *ret_other_count = other_count; + return S_OK; } static HRESULT WINAPI import_GetParamProps(IMetaDataImport *iface, mdParamDef param_def, mdMethodDef *method_def, diff --git a/dlls/rometadata/tests/rometadata.c b/dlls/rometadata/tests/rometadata.c index d6f856b0fce..354d3c779f5 100644 --- a/dlls/rometadata/tests/rometadata.c +++ b/dlls/rometadata/tests/rometadata.c @@ -950,16 +950,15 @@ static void test_prop_method_token_(int line, IMetaDataImport *md_import, mdType ok_(__FILE__, line)(token && token != mdMethodDefNil, "got token %#x\n", token); valid = IMetaDataImport_IsValidToken(md_import, token); - ok_(__FILE__, line)(valid, "got value %d\n", valid); + todo_wine ok_(__FILE__, line)(valid, "got value %d\n", valid); name[0] = L'\0'; hr = IMetaDataImport_GetMethodProps(md_import, token, &type_def, name, ARRAY_SIZE(name), NULL, &attrs, NULL, NULL, NULL, &impl); - todo_wine ok_(__FILE__, line)(hr == S_OK, "GetMethodProps failed, got hr %#lx\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetMethodProps failed, got hr %#lx\n", hr); swprintf(exp_name, ARRAY_SIZE(exp_name), L"%s_%s", prefix, prop_name); - todo_wine ok_(__FILE__, line)(!wcscmp(name, exp_name), "got name %s != %s\n", debugstr_w(name), - debugstr_w(exp_name)); - todo_wine ok_(__FILE__, line)(attrs == exp_attrs, "got attrs %#lx != %#x\n", attrs, exp_attrs); - todo_wine ok_(__FILE__, line)(!impl, "got impl %#lx\n", impl); + ok_(__FILE__, line)(!wcscmp(name, exp_name), "got name %s != %s\n", debugstr_w(name), debugstr_w(exp_name)); + ok_(__FILE__, line)(attrs == exp_attrs, "got attrs %#lx != %#x\n", attrs, exp_attrs); + ok_(__FILE__, line)(!impl, "got impl %#lx\n", impl); } static void test_IMetaDataImport(void) @@ -1273,16 +1272,16 @@ static void test_IMetaDataImport(void) ok(hr == S_OK, "got hr %#lx\n", hr); henum = NULL; hr = IMetaDataImport_EnumProperties(md_import, &henum, typedef1, NULL, 0, NULL); - todo_wine ok(hr == S_FALSE, "got hr %#lx\n", hr); + ok(hr == S_FALSE, "got hr %#lx\n", hr); hr = IMetaDataImport_CountEnum(md_import, henum, &buf_len); ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(buf_len == ARRAY_SIZE(test3_props), "got buf_len %lu\n", buf_len); + ok(buf_len == ARRAY_SIZE(test3_props), "got buf_len %lu\n", buf_len); property_tokens = calloc(buf_len, sizeof(*property_tokens)); ok(!!property_tokens, "got property_tokens %p\n", property_tokens); buf_count = 0xdeadbeef; hr = IMetaDataImport_EnumProperties(md_import, &henum, typedef1, property_tokens, buf_len, &buf_count); - todo_wine ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(buf_count == buf_len, "got buf_count %lu != %lu\n", buf_count, buf_len); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(buf_count == buf_len, "got buf_count %lu != %lu\n", buf_count, buf_len); IMetaDataImport_CloseEnum(md_import, henum); for (i = 0; i < buf_len; i++) { @@ -1300,11 +1299,11 @@ static void test_IMetaDataImport(void) hr = IMetaDataImport_GetPropertyProps(md_import, property_tokens[i], &typedef2, name, ARRAY_SIZE(name), &str_reqd, &val, &sig_blob, &sig_len, &value_type, &value, &value_len, &set_method, &get_method, NULL, 0, NULL); - todo_wine ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(typedef1 == typedef2, "got typedef1 %#x != %#x\n", typedef1, typedef2); - todo_wine ok(!wcscmp(name, props->exp_name), "got name %s != %s\n", debugstr_w(name), debugstr_w(props->exp_name)); - todo_wine ok(!!sig_blob, "got sig_blob %p\n", sig_blob); - todo_wine ok(sig_len == props->exp_sig_len, "got sig_len %lu != %lu\n", sig_len, props->exp_sig_len); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(typedef1 == typedef2, "got typedef1 %#x != %#x\n", typedef1, typedef2); + ok(!wcscmp(name, props->exp_name), "got name %s != %s\n", debugstr_w(name), debugstr_w(props->exp_name)); + ok(!!sig_blob, "got sig_blob %p\n", sig_blob); + ok(sig_len == props->exp_sig_len, "got sig_len %lu != %lu\n", sig_len, props->exp_sig_len); if (sig_blob && sig_len == props->exp_sig_len) ok(!memcmp(sig_blob, props->exp_sig_blob, sig_len), "got unexpected sig_blob\n"); ok(!value_len, "got value_len %lu\n", value_len); @@ -1312,11 +1311,11 @@ static void test_IMetaDataImport(void) if (props->has_get) test_prop_method_token(md_import, typedef1, props->exp_name, PROP_METHOD_GET, get_method); else - todo_wine ok(get_method == mdMethodDefNil, "got get_method %#x\n", get_method); + ok(get_method == mdMethodDefNil, "got get_method %#x\n", get_method); if (props->has_set) test_prop_method_token(md_import, typedef1, props->exp_name, PROP_METHOD_SET, set_method); else - todo_wine ok(set_method == mdMethodDefNil, "got set_method %#x\n", set_method); + ok(set_method == mdMethodDefNil, "got set_method %#x\n", set_method); winetest_pop_context(); } IMetaDataImport_Release(md_import); diff --git a/include/corhdr.h b/include/corhdr.h index afa2d1e14e0..d18ed677167 100644 --- a/include/corhdr.h +++ b/include/corhdr.h @@ -303,4 +303,14 @@ typedef enum CorFieldAttr #define COR_ENUM_FIELD_NAME ("value__") #define COR_ENUM_FIELD_NAME_W (L"value__") +typedef enum CorMethodSemanticsAttr +{ + msSetter = 0x01, + msGetter = 0x02, + msOther = 0x04, + msAddOn = 0x08, + msRemoveOn = 0x10, + msFire = 0x20, +} CorMethodSemanticsAttr; + #endif /* __WINE_CORHDR_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9560