- Change some of the registry helper functions to use the unicode

dlls/ole32/compobj_private.h

@@ -163,6 +163,7 @@ extern void* StdGlobalInterfaceTableInstance;
 extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr);
 HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id);
 
+DWORD COM_OpenKeyForCLSID(REFCLSID clsid, REGSAM access, HKEY *key);
 HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv);
 
 /* Stub Manager */
@@ -256,4 +257,6 @@ static inline APARTMENT* COM_CurrentApt(void)
 
 extern HINSTANCE OLE32_hInstance; /* FIXME: make static */
 
+#define CHARS_IN_GUID 39 /* including NULL */
+
 #endif /* __WINE_OLE_COMPOBJ_H */

dlls/ole32/tests/.cvsignore

 Makefile
+compobj.ok
 marshal.ok
 moniker.ok
 propvariant.ok

dlls/ole32/tests/Makefile.in

@@ -7,6 +7,7 @@ IMPORTS   = oleaut32 ole32 user32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
+	compobj.c \
 	marshal.c \
 	moniker.c \
 	propvariant.c \

dlls/ole32/tests/compobj.c

+/*
+ * Component Object Tests
+ *
+ * Copyright 2005 Robert Shearman
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define COBJMACROS
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+
+#include "wine/test.h"
+
+#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr)
+
+static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } };
+static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0};
+
+static void test_ProgIDFromCLSID(void)
+{
+    LPWSTR progid;
+    HRESULT hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, &progid);
+    ok(hr == S_OK, "ProgIDFromCLSID failed with error 0x%08lx\n", hr);
+    if (hr == S_OK)
+    {
+        ok(!lstrcmpiW(progid, devicedotone), "Didn't get expected prog ID\n");
+        CoTaskMemFree(progid);
+    }
+}
+
+static void test_CLSIDFromProgID(void)
+{
+    CLSID clsid;
+    HRESULT hr = CLSIDFromProgID(devicedotone, &clsid);
+    ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr);
+    ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n");
+}
+
+START_TEST(compobj)
+{
+    test_ProgIDFromCLSID();
+    test_CLSIDFromProgID();
+}