From: Vibhav Pant vibhavp@gmail.com
--- dlls/rometadata/mdtables.c | 188 ++++++++++++++++++++++++----- dlls/rometadata/tests/rometadata.c | 20 +-- 2 files changed, 170 insertions(+), 38 deletions(-)
diff --git a/dlls/rometadata/mdtables.c b/dlls/rometadata/mdtables.c index 10e02ba9a10..0c3ee5eb1d7 100644 --- a/dlls/rometadata/mdtables.c +++ b/dlls/rometadata/mdtables.c @@ -321,19 +321,54 @@ static ULONG WINAPI import_Release(IMetaDataImport *iface) return IMetaDataTables_Release(&impl->IMetaDataTables_iface); }
+enum token_enum_type +{ + TOKEN_ENUM_RANGE, + TOKEN_ENUM_LIST +}; struct token_enum { - ULONG count; - ULONG row_start; - ULONG row_cur; - ULONG row_end; + enum token_enum_type type; + ULONG pos; + + union + { + struct + { + ULONG start; + ULONG end; + } range; + struct + { + ULONG count; + ULONG rows[1]; + } list; + } data; };
-HRESULT token_enum_create(HCORENUM *out) +static HRESULT token_enum_range_create(HCORENUM *out, ULONG row_start, ULONG row_end) { struct token_enum *md_enum;
+ assert(row_start <= row_end); if (!(md_enum = calloc(1, sizeof(*md_enum)))) return E_OUTOFMEMORY; + md_enum->type = TOKEN_ENUM_RANGE; + md_enum->pos = md_enum->data.range.start = row_start; + md_enum->data.range.end = row_end; + *out = md_enum; + return S_OK; +} + +static HRESULT token_enum_list_create(HCORENUM *out, ULONG count, const ULONG *rows) +{ + struct token_enum *md_enum; + + assert(rows && count); + if (!(md_enum = calloc(1, offsetof(struct token_enum, data.list.rows[count])))) return E_OUTOFMEMORY; + md_enum->type = TOKEN_ENUM_LIST; + md_enum->pos = 0; + md_enum->data.list.count = count; + memcpy(md_enum->data.list.rows, rows, count); *out = md_enum; return S_OK; } @@ -343,8 +378,19 @@ static HRESULT token_enum_get_entries(struct token_enum *henum, CorTokenType typ { ULONG i = 0;
- while (henum->row_cur <= henum->row_end && i < buf_len) - buf[i++] = TokenFromRid(henum->row_cur++, type); + switch (henum->type) + { + case TOKEN_ENUM_RANGE: + while (henum->pos <= henum->data.range.end && i < buf_len) + buf[i++] = TokenFromRid(henum->pos++, type); + break; + case TOKEN_ENUM_LIST: + assert(henum->data.list.count); + while (henum->pos < henum->data.list.count && i < buf_len) + buf[i++] = TokenFromRid(henum->data.list.rows[henum->pos++], type); + break; + } + if (buf_written) *buf_written = i; return !!i ? S_OK : S_FALSE; @@ -362,7 +408,23 @@ static HRESULT WINAPI import_CountEnum(IMetaDataImport *iface, HCORENUM henum, U
TRACE("(%p, %p, %p)\n", iface, henum, count);
- *count = henum ? md_enum->count : 0; + if (!henum) + { + *count = 0; + return S_OK; + } + switch (md_enum->type) + { + case TOKEN_ENUM_RANGE: + assert(md_enum->data.range.start && md_enum->data.range.start <= md_enum->data.range.end); + *count = md_enum->data.range.end - md_enum->data.range.start + 1; + break; + case TOKEN_ENUM_LIST: + *count = md_enum->data.list.count; + break; + DEFAULT_UNREACHABLE; + } + return S_OK; }
@@ -372,8 +434,17 @@ static HRESULT WINAPI import_ResetEnum(IMetaDataImport *iface, HCORENUM henum, U
TRACE("(%p, %p, %lu)\n", iface, henum, idx);
- if (henum) - md_enum->row_cur = md_enum->row_start + idx; + if (!henum) return S_OK; + switch (md_enum->type) + { + case TOKEN_ENUM_RANGE: + md_enum->pos = md_enum->data.range.start + idx; + break; + case TOKEN_ENUM_LIST: + md_enum->pos = idx; + break; + DEFAULT_UNREACHABLE; + } return S_OK; }
@@ -438,7 +509,6 @@ static HRESULT table_get_num_rows(IMetaDataTables *iface, enum table table, ULON static HRESULT WINAPI import_EnumTypeDefs(IMetaDataImport *iface, HCORENUM *ret_henum, mdTypeDef *typedefs, ULONG len, ULONG *count) { struct metadata_tables *impl = impl_from_IMetaDataImport(iface); - struct token_enum *henum = *ret_henum; ULONG rows; HRESULT hr;
@@ -447,21 +517,16 @@ static HRESULT WINAPI import_EnumTypeDefs(IMetaDataImport *iface, HCORENUM *ret_ if (count) *count = 0;
- if (!henum) + if (!*ret_henum) { hr = table_get_num_rows(&impl->IMetaDataTables_iface, TABLE_TYPEDEF, &rows); if (FAILED(hr)) return hr; /* Skip the <Module> row. */ if (rows < 2) return S_FALSE; - if (FAILED((hr = token_enum_create((HCORENUM *)&henum)))) return hr; - - henum->count = rows - 1; - henum->row_start = henum->row_cur = 2; - henum->row_end = rows; - *ret_henum = henum; + if (FAILED((hr = token_enum_range_create(ret_henum, 2, rows)))) return hr; }
- return token_enum_get_entries(henum, mdtTypeDef, typedefs, len, count); + return token_enum_get_entries(*ret_henum, mdtTypeDef, typedefs, len, count); }
static HRESULT WINAPI import_EnumInterfaceImpls(IMetaDataImport *iface, HCORENUM *henum, mdTypeDef type_def, @@ -741,6 +806,7 @@ static HRESULT table_create_enum_from_token_list(IMetaDataTables *iface, enum ta if (FAILED((hr = table_get_num_rows(iface, table, &num_rows)))) return hr; if (row > num_rows) return S_FALSE; if (FAILED((hr = IMetaDataTables_GetColumn(iface, table, col, row, &row_start)))) return hr; + if (IsNilToken(row_start)) return S_FALSE; row_start = RidFromToken(row_start);
if (row != num_rows) @@ -753,11 +819,8 @@ static HRESULT table_create_enum_from_token_list(IMetaDataTables *iface, enum ta else if (FAILED((hr = table_get_num_rows(iface, list_table, &row_end)))) return hr;
- if (FAILED((hr = token_enum_create((HCORENUM *)&henum)))) return hr; - - henum->count = row_end - row_start + 1; - henum->row_start = henum->row_cur = row_start; - henum->row_end = row_end; + if (row_end < row_start) return S_FALSE; + if (FAILED((hr = token_enum_range_create((HCORENUM *)&henum, row_start, row_end)))) return hr; *ret_henum = henum; return S_OK; } @@ -789,11 +852,80 @@ static HRESULT WINAPI import_EnumMethods(IMetaDataImport *iface, HCORENUM *ret_h return token_enum_get_entries(*ret_henum, mdtMethodDef, method_defs, len, count); }
-static HRESULT WINAPI import_EnumMethodsWithName(IMetaDataImport *iface, HCORENUM *henum, mdTypeDef type_def, - const WCHAR *name, mdMethodDef *method_defs, ULONG len, ULONG *count) +static HRESULT WINAPI import_EnumMethodsWithName(IMetaDataImport *iface, HCORENUM *ret_henum, mdTypeDef type_def, + const WCHAR *name, mdMethodDef *method_defs, ULONG len, ULONG *ret_count) { - FIXME("(%p, %p, %#x, %s, %p, %lu, %p): stub!\n", iface, henum, type_def, debugstr_w(name), method_defs, len, count); - return E_NOTIMPL; + TRACE("(%p, %p, %s, %s, %p, %lu, %p): stub!\n", iface, ret_henum, debugstr_mdToken(type_def), debugstr_w(name), + method_defs, len, ret_count); + + if (!name) return IMetaDataImport_EnumMethods(iface, ret_henum, type_def, method_defs, len, ret_count); + if (ret_count) *ret_count = 0; + if (TypeFromToken(type_def) != mdtTypeDef || IsNilToken(type_def)) return S_FALSE; + + if (!*ret_henum) + { + ULONG cur_name_len = 80, count, *methods; + HCORENUM all_methods = NULL; + mdMethodDef cur_method; + WCHAR *cur_name, *tmp; + HRESULT hr; + + if (!(cur_name = malloc(sizeof(WCHAR) * cur_name_len))) return E_OUTOFMEMORY; + hr = IMetaDataImport_EnumMethods(iface, &all_methods, type_def, &cur_method, 1, NULL); + if (hr != S_OK) + { + free(cur_name); + return hr; + } + if (FAILED((hr = IMetaDataImport_CountEnum(iface, all_methods, &count)))) + { + free(cur_name); + IMetaDataImport_CloseEnum(iface, all_methods); + return hr; + } + if (!(methods = calloc(count, sizeof(*methods)))) + { + free(cur_name); + IMetaDataImport_CloseEnum(iface, all_methods); + return E_OUTOFMEMORY; + } + count = 0; + while (hr == S_OK) + { + ULONG reqd; + + hr = IMetaDataImport_GetMethodProps(iface, cur_method, NULL, cur_name, cur_name_len, &reqd, NULL, NULL, NULL, + NULL, NULL); + if (hr == CLDB_E_TRUNCATION) + { + cur_name_len = reqd; + if (!(tmp = realloc(cur_name, sizeof(WCHAR) * cur_name_len))) + { + hr = E_OUTOFMEMORY; + break; + } + cur_name = tmp; + continue; /* Try again */ + } + else if (FAILED(hr)) + break; + if (!wcsncmp(cur_name, name, reqd)) + methods[count++] = RidFromToken(cur_method); + hr = IMetaDataImport_EnumMethods(iface, &all_methods, type_def, &cur_method, 1, NULL); + } + + free(cur_name); + IMetaDataImport_CloseEnum(iface, all_methods); + if (FAILED(hr) || !count) + { + free(methods); + return FAILED(hr) ? hr : S_FALSE; + } + hr = token_enum_list_create(ret_henum, count, methods); + free(methods); + if (FAILED(hr)) return hr; + } + return token_enum_get_entries(*ret_henum, mdtMethodDef, method_defs, len, ret_count); }
static HRESULT WINAPI import_EnumFields(IMetaDataImport *iface, HCORENUM *ret_henum, mdTypeDef token, diff --git a/dlls/rometadata/tests/rometadata.c b/dlls/rometadata/tests/rometadata.c index 5e15eb1a2bd..060721d5b32 100644 --- a/dlls/rometadata/tests/rometadata.c +++ b/dlls/rometadata/tests/rometadata.c @@ -1188,18 +1188,18 @@ static void test_IMetaDataImport(void) henum2 = NULL; methoddef = mdMethodDefNil; hr = IMetaDataImport_EnumMethodsWithName(md_import, &henum2, typedef2, name, NULL, 0, NULL); - todo_wine ok(hr == S_FALSE, "got hr %#lx\n", hr); - todo_wine ok(!!henum2, "got henum2 %p\n", henum2); + ok(hr == S_FALSE, "got hr %#lx\n", hr); + ok(!!henum2, "got henum2 %p\n", henum2); buf_len2 = 0; hr = IMetaDataImport_CountEnum(md_import, henum2, &buf_len2); ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(buf_len2 == 1, "got buf_count2 %lu\n", buf_len2); + ok(buf_len2 == 1, "got buf_count2 %lu\n", buf_len2); buf_len2 = 0; hr = IMetaDataImport_EnumMethodsWithName(md_import, &henum2, typedef2, name, &methoddef, 1, &buf_len2); - todo_wine ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(buf_len2 == 1, "got count %lu\n", hr); - todo_wine ok(methoddef == methoddef_tokens[i], "got methoddef %s != %s\n", debugstr_mdToken(methoddef), - debugstr_mdToken(methoddef_tokens[i])); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(buf_len2 == 1, "got count %lu\n", hr); + ok(methoddef == methoddef_tokens[i], "got methoddef %s != %s\n", debugstr_mdToken(methoddef), + debugstr_mdToken(methoddef_tokens[i])); IMetaDataImport_CloseEnum(md_import, henum2);
token = mdTokenNil; @@ -1225,12 +1225,12 @@ static void test_IMetaDataImport(void) henum = NULL; /* EnumMethodsWithName with a NULL name is the same as EnumMethods. */ hr = IMetaDataImport_EnumMethodsWithName(md_import, &henum, typedef2, NULL, NULL, 0, NULL); - todo_wine ok(hr == S_FALSE, "got hr %#lx\n", hr); - todo_wine ok(!!henum, "got henum %p\n", henum); + ok(hr == S_FALSE, "got hr %#lx\n", hr); + ok(!!henum, "got henum %p\n", henum); buf_len2 = 0; hr = IMetaDataImport_CountEnum(md_import, henum, &buf_len2); ok(hr == S_OK, "got hr %#lx\n", hr); - todo_wine ok(buf_len2 == buf_len, "got buf_len2 %lu != %lu\n", buf_len2, buf_len); + ok(buf_len2 == buf_len, "got buf_len2 %lu != %lu\n", buf_len2, buf_len); IMetaDataImport_CloseEnum(md_import, henum);
for (i = 0; i < ARRAY_SIZE(field_enum_test_cases); i++)