[OLEAUT32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

svn path=/trunk/; revision=75893
This commit is contained in:
Amine Khaldi 2017-09-17 22:56:47 +00:00
parent 1fdf9e8b55
commit 212b13d23c
3 changed files with 101 additions and 583 deletions

View file

@ -5053,6 +5053,22 @@ static void test_LoadTypeLib(void)
hres = LoadTypeLib(kernel32_dllW, &tl);
ok(hres == TYPE_E_CANTLOADLIBRARY, "LoadTypeLib returned: %08x, expected TYPE_E_CANTLOADLIBRARY\n", hres);
hres = LoadTypeLib(NULL, NULL);
ok(hres == E_INVALIDARG, "Got %#x.\n", hres);
tl = (void *)0xdeadbeef;
hres = LoadTypeLib(NULL, &tl);
ok(hres == E_INVALIDARG, "Got %#x.\n", hres);
ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl);
hres = LoadTypeLibEx(NULL, REGKIND_NONE, NULL);
ok(hres == E_INVALIDARG, "Got %#x.\n", hres);
tl = (void *)0xdeadbeef;
hres = LoadTypeLibEx(NULL, REGKIND_NONE, &tl);
ok(hres == E_INVALIDARG, "Got %#x.\n", hres);
ok(tl == (void *)0xdeadbeef, "Got %p.\n", tl);
}
static void test_SetVarHelpContext(void)

View file

@ -6097,7 +6097,7 @@ static void test_VarCat(void)
SET_EXPECT(dispatch_invoke);
hres = VarCat(&left, &right, &result);
todo_wine ok(hres == S_OK, "got 0x%08x\n", hres);
ok(hres == S_OK, "got 0x%08x\n", hres);
ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result));
ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result)));
CHECK_CALLED(dispatch_invoke);
@ -6112,7 +6112,7 @@ static void test_VarCat(void)
SET_EXPECT(dispatch_invoke);
hres = VarCat(&left, &right, &result);
todo_wine ok(hres == S_OK, "got 0x%08x\n", hres);
ok(hres == S_OK, "got 0x%08x\n", hres);
ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result));
ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result)));
CHECK_CALLED(dispatch_invoke);
@ -6144,7 +6144,21 @@ static void test_VarCat(void)
SET_EXPECT(dispatch_invoke);
hres = VarCat(&left, &right, &result);
todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres);
ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres);
CHECK_CALLED(dispatch_invoke);
VariantClear(&left);
VariantClear(&right);
VariantClear(&result);
init_test_dispatch(VT_NULL, &dispatch);
dispatch.result = DISP_E_TYPEMISMATCH;
V_VT(&right) = VT_DISPATCH;
V_DISPATCH(&right) = &dispatch.IDispatch_iface;
SET_EXPECT(dispatch_invoke);
hres = VarCat(&left, &right, &result);
ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres);
CHECK_CALLED(dispatch_invoke);
VariantClear(&left);

File diff suppressed because it is too large Load diff