From 9704fcaf730547c7c55604d21adb1821edc8e9b1 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 31 Dec 2012 14:29:23 +0100
Subject: [PATCH] atl100: Fixed NULL catmap handling in
 AtlRegisterClassCategoriesHelper.

---
 dlls/atl100/atl.c       | 3 +++
 dlls/atl100/tests/atl.c | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c
index accc88ce969..1033952f8d1 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 35ef34b95ed..c6400036906 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 "}");
+
+    ok(RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}") == ERROR_SUCCESS, "Could not delete key\n");
+
+    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)