[PATCH v9 1/2] ole32/tests:add the find CurVer test in CLSIDFromProgID.

[Maotong Zhang]

From: Maotong Zhang

---
 dlls/ole32/tests/compobj.c | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 94b83024b91..7971b5022f6 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -433,6 +433,8 @@ static void test_CLSIDFromProgID(void)
     ULONG_PTR cookie = 0;
     HANDLE handle;
     CLSID clsid;
+    HKEY hKey;
+    WCHAR clsidstr[39];
     HRESULT hr = CLSIDFromProgID(stdfont, &clsid);
     ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr);
     ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n");
@@ -441,6 +443,52 @@ static void test_CLSIDFromProgID(void)
     ok_ole_success(hr, "CLSIDFromString");
     ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n");

+    StringFromGUID2(&CLSID_non_existent, clsidstr, ARRAYSIZE(clsidstr));
+    if (RegCreateKeyExW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest\CurVer", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)L"MyApp.DocumentTest.1", (wcslen(L"MyApp.DocumentTest.1") + 1) * sizeof(WCHAR));
+        RegCloseKey(hKey);
+    }
+    if (RegCreateKeyExW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.1\CurVer", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)L"MyApp.DocumentTest.2", (wcslen(L"MyApp.DocumentTest.2") + 1) * sizeof(WCHAR));
+        RegCloseKey(hKey);
+    }
+    if (RegCreateKeyExW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.2\CurVer", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)L"MyApp.DocumentTest.1", (wcslen(L"MyApp.DocumentTest.1") + 1)* sizeof(WCHAR));
+        RegCloseKey(hKey);
+    }
+    if (RegCreateKeyExW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.2\CLSID", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)clsidstr, (wcslen(clsidstr) + 1) * sizeof(WCHAR));
+        RegCloseKey(hKey);
+    }
+    if (RegCreateKeyExW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.3\CurVer", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey);
+    }
+
+    hr = CLSIDFromProgID(L"MyApp.DocumentTest", &clsid);
+    ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr);
+    ok(IsEqualCLSID(&clsid, &CLSID_non_existent), "got wrong clsid %s\n", wine_dbgstr_guid(&clsid));
+
+    hr = CLSIDFromProgID(L"MyApp.DocumentTest.1", &clsid);
+    ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr);
+    ok(IsEqualCLSID(&clsid, &CLSID_non_existent), "got wrong clsid %s\n", wine_dbgstr_guid(&clsid));
+
+    hr = CLSIDFromProgID(L"MyApp.DocumentTest.2", &clsid);
+    ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08lx\n", hr);
+    ok(IsEqualCLSID(&clsid, &CLSID_non_existent), "got wrong clsid %s\n", wine_dbgstr_guid(&clsid));
+
+    hr = CLSIDFromProgID(L"MyApp.DocumentTest.3", &clsid);
+    ok(hr == CO_E_CLASSSTRING, "CLSIDFromProgID CurVer content is empty should have returned CO_E_CLASSSTRING instead of 0x%08lx\n", hr);
+    ok(IsEqualCLSID(&clsid, &CLSID_NULL), "CLSIDFromProgID should have set clsid to all-zeros on failure\n");
+    RegDeleteTreeW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest");
+    RegDeleteTreeW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.1");
+    RegDeleteTreeW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.2");
+    RegDeleteTreeW(HKEY_CLASSES_ROOT, L"MyApp.DocumentTest.3");
+
     /* test some failure cases */

hr = CLSIDFromProgID(wszNonExistent, NULL);