comcat: cImplemented or cRequired of -1 means to match everything

regardless of the implementation or categories.

configure.ac

@@ -1566,6 +1566,7 @@ dlls/capi2032/Makefile
 dlls/cards/Makefile
 dlls/cfgmgr32/Makefile
 dlls/comcat/Makefile
+dlls/comcat/tests/Makefile
 dlls/comctl32/Makefile
 dlls/comctl32/tests/Makefile
 dlls/comdlg32/Makefile

dlls/comcat/Makefile.in

@@ -17,6 +17,8 @@ C_SRCS = \
 RC_SRCS = \
 	version.rc
 
+SUBDIRS = tests
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/comcat/information.c

@@ -163,6 +163,11 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories(
 
     TRACE("\n");
 
+	if (cImplemented == (ULONG)-1) 
+		cImplemented = 0;
+	if (cRequired == (ULONG)-1) 
+		cRequired = 0;
+	
     if (iface == NULL || ppenumCLSID == NULL ||
 	(cImplemented && rgcatidImpl == NULL) ||
 	(cRequired && rgcatidReq == NULL)) return E_POINTER;

dlls/comcat/tests/Makefile.in

@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = comcat.dll
+IMPORTS   = ole32 advapi32 kernel32
+EXTRALIBS = -luuid
+
+CTESTS = \
+	comcat.c
+
+@MAKE_TEST_RULES@
+
+### Dependencies:

dlls/comcat/tests/comcat.c

@@ -0,0 +1,129 @@
+/*
+ * tests for comcat functions
+ *
+ * Copyright 2006 Aric Stewart for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include <stdio.h>
+#include <windows.h>
+
+#include "objbase.h"
+#include "comcat.h"
+
+#include "wine/test.h"
+
+#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx \n", hr)
+
+static void register_testentry(void)
+{
+	HKEY hkey,hkey2;
+
+	RegCreateKeyA(HKEY_CLASSES_ROOT,"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}",
+			&hkey);
+	RegSetValueA(hkey,NULL,REG_SZ,"ComCat Test key",16);
+	RegCreateKeyA(hkey,
+			"Implemented Categories\\{deadcafe-0000-0000-0000-000000000000}",
+			&hkey2);
+
+	RegCloseKey(hkey);
+	RegCloseKey(hkey2);
+}
+
+static void unregister_testentry(void)
+{
+	RegDeleteKeyA(HKEY_CLASSES_ROOT,
+			"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}\\Implemented Categories\\{deadcafe-0000-0000-0000-000000000000}");
+	RegDeleteKeyA(HKEY_CLASSES_ROOT,
+			"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}\\Implemented Categories");
+	RegDeleteKeyA(HKEY_CLASSES_ROOT,
+			"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}");
+}
+
+static void do_enum(void)
+{
+	HRESULT hr;
+	REFCLSID rclsid = &CLSID_StdComponentCategoriesMgr;
+	ICatInformation *pICat = (ICatInformation*)0xdeadbeef;
+	GUID the_guid[1];
+	GUID the_cat[1];
+	GUID wanted_guid;
+	ULONG fetched = -1;
+	
+	static const WCHAR szCatID[] = {
+			'{',
+			'd','e','a','d','c','a','f','e',
+			'-','0','0','0','0','-','0','0','0','0',
+			'-','0','0','0','0',
+			'-','0','0','0','0','0','0','0','0','0','0','0','0',
+			'}',0};
+	static const WCHAR szGuid[] = {
+			'{',
+			'd','e','a','d','c','a','f','e','-',
+			'b','e','e','d','-',
+			'b','e','a','d','-',
+			'd','e','a','d','-',
+			'c','a','f','e','b','e','a','d','d','e','a','d',
+			'}',0};
+
+	IEnumCLSID *pIEnum =(IEnumCLSID*)0xdeadcafe;
+
+	CLSIDFromString((LPOLESTR)szCatID,the_cat);
+	CLSIDFromString((LPOLESTR)szGuid,&wanted_guid);
+	
+	OleInitialize(NULL);
+
+	hr = CoCreateInstance(rclsid,NULL,CLSCTX_INPROC_SERVER,
+			&IID_ICatInformation, (void **)&pICat);
+	ok_ole_success(hr, "CoCreateInstance");
+
+	hr = ICatInformation_EnumClassesOfCategories(pICat, -1, NULL, -1, NULL,
+			&pIEnum);
+	ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories");
+
+	IEnumGUID_Release(pIEnum);
+	
+	hr = ICatInformation_EnumClassesOfCategories(pICat, 1, the_cat, -1, NULL, 
+			&pIEnum);
+	ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories");
+
+	hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched);
+	ok (fetched == 0,"Fetched wrong number of guids %lu\n",fetched);
+	IEnumGUID_Release(pIEnum);
+	
+	register_testentry();
+	hr = ICatInformation_EnumClassesOfCategories(pICat, 1, the_cat, -1, NULL, 
+			&pIEnum);
+	ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories");
+
+	hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched);
+	ok (fetched == 1,"Fetched wrong number of guids %lu\n",fetched);
+	ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");
+
+	IEnumGUID_Release(pIEnum);
+	ICatInformation_Release(pICat);
+	unregister_testentry();
+
+	OleUninitialize();
+}
+
+
+START_TEST(comcat)
+{
+ 	do_enum(); 
+}

programs/winetest/Makefile.in

@@ -22,6 +22,7 @@ TESTBINS = \
 	advapi32_test.exe$(DLLEXT) \
 	advpack_test.exe$(DLLEXT) \
 	cabinet_test.exe$(DLLEXT) \
+	comcat_test.exe$(DLLEXT) \
 	comctl32_test.exe$(DLLEXT) \
 	comdlg32_test.exe$(DLLEXT) \
 	crypt32_test.exe$(DLLEXT) \
@@ -108,6 +109,8 @@ advapi32_test.exe$(DLLEXT): $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT)
 	cp $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 cabinet_test.exe$(DLLEXT): $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT)
 	cp $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) $@ && $(STRIP) $@
+comcat_test.exe$(DLLEXT): $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT)
+	cp $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT) $@ && $(STRIP) $@
 comctl32_test.exe$(DLLEXT): $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT)
 	cp $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 comdlg32_test.exe$(DLLEXT): $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT)