From: Jacek Caban Subject: atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper Message-Id: <50E18AC6.4000500@codeweavers.com> Date: Mon, 31 Dec 2012 13:53:26 +0100 --- dlls/atl100/atl.c | 3 +++ dlls/atl100/tests/atl.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index accc88c..1033952 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -429,6 +429,9 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _AT TRACE("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); + if(!catmap) + return S_OK; + if(!catreg) { ICatRegister *new_catreg; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 35ef34b..0f45706 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -154,6 +154,13 @@ static void test_regcat(void) test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Implemented Categories"); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Required Categories"); test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + RegDeleteTreeA(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, NULL, TRUE); + ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); + + test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); } static void test_typelib(void)