Commit a1e28f70 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

oleaut32/tests: Some tests for QueryPathOfRegTypeLib() with activated context.

parent a157c7bd
...@@ -1234,7 +1234,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) ...@@ -1234,7 +1234,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch)
for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
{ {
ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, 0, &path); ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, LOCALE_NEUTRAL, &path);
ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08x\n", td[i].maj, td[i].min, ret); ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08x\n", td[i].maj, td[i].min, ret);
if (ret == S_OK) if (ret == S_OK)
{ {
...@@ -4470,6 +4470,7 @@ static void test_LoadRegTypeLib(void) ...@@ -4470,6 +4470,7 @@ static void test_LoadRegTypeLib(void)
HANDLE handle; HANDLE handle;
ITypeLib *tl; ITypeLib *tl;
HRESULT hr; HRESULT hr;
BSTR path;
BOOL ret; BOOL ret;
if (!pActivateActCtx) if (!pActivateActCtx)
...@@ -4495,9 +4496,35 @@ static void test_LoadRegTypeLib(void) ...@@ -4495,9 +4496,35 @@ static void test_LoadRegTypeLib(void)
hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl); hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl);
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path);
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
ret = pActivateActCtx(handle, &cookie); ret = pActivateActCtx(handle, &cookie);
ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); ok(ret, "ActivateActCtx failed: %u\n", GetLastError());
path = NULL;
hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path);
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
SysFreeString(path);
path = NULL;
hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &path);
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
SysFreeString(path);
path = NULL;
hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &path);
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
SysFreeString(path);
path = NULL;
hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &path);
ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr);
SysFreeString(path);
/* manifest version is 2.0, actual is 1.0 */ /* manifest version is 2.0, actual is 1.0 */
hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl); hr = LoadRegTypeLib(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, &tl);
ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment