ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32/tests: Avoid "misleading indentation" warnings. 

Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Fabian Maurer 2022-01-27 20:18:03 +01:00 committed by Alexandre Julliard
parent 56412c1145
commit 812944ec17
8 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ole32/tests/compobj.c
View File

@ -3817,7 +3817,7 @@ static void test_CoGetInstanceFromFile(void)
mqi[0].pItf = NULL;
mqi[0].hr = E_NOTIMPL;
hr = CoGetInstanceFromFile(NULL, NULL, NULL, CLSCTX_INPROC_SERVER, STGM_READ, (OLECHAR*)filenameW, 1, mqi);
todo_wine
todo_wine
ok(hr == MK_E_CANTOPENFILE, "got 0x%08x\n", hr);
ok(mqi[0].pItf == NULL, "got %p\n", mqi[0].pItf);
ok(mqi[0].hr == E_NOINTERFACE, "got 0x%08x\n", mqi[0].hr);
@ -4186,7 +4186,7 @@ static void test_CoCreateInstanceFromApp(void)
hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_APPCONTAINER, NULL,
&IID_IClassFactory, (void **)&unk);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);

8
dlls/ole32/tests/defaulthandler.c
View File

@ -286,7 +286,7 @@ static void test_default_handler_run(void)
SET_EXPECT(CF_QueryInterface_ClassFactory);
SET_EXPECT(CF_CreateInstance);
hres = IRunnableObject_Run(ro, NULL);
todo_wine
todo_wine
ok(hres == S_OK, "Run failed: %x\n", hres);
CHECK_CALLED(CF_QueryInterface_ClassFactory);
CHECK_CALLED(CF_CreateInstance);
@ -296,11 +296,11 @@ todo_wine
SET_EXPECT(CF_CreateInstance);
hres = CoCreateInstance(&test_server_clsid, NULL, CLSCTX_LOCAL_SERVER,
&IID_IOleObject, (void**)&oleobj);
todo_wine
todo_wine
ok(hres == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %x\n", hres);
todo_wine
todo_wine
CHECK_NOT_CALLED(CF_QueryInterface_ClassFactory);
todo_wine
todo_wine
CHECK_NOT_CALLED(CF_CreateInstance);
SET_EXPECT(CF_QueryInterface_IMarshal);

2
dlls/ole32/tests/marshal.c
View File

@ -1344,7 +1344,7 @@ static void test_marshal_channel_buffer(void)
SET_EXPECT(Disconnect);
IUnknown_Release(proxy);
todo_wine
todo_wine
CHECK_CALLED(Disconnect);
hr = CoRevokeClassObject(registration_key);

88
dlls/ole32/tests/moniker.c
View File

@ -96,7 +96,7 @@ static void _test_moniker_type(IMoniker *moniker, DWORD type, BOOL todo, int lin
hr = IMoniker_IsSystemMoniker(moniker, &type2);
ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#x.\n", hr);
todo_wine_if(todo)
todo_wine_if(todo)
ok_(__FILE__, line)(type2 == type, "Unexpected moniker type %d.\n", type2);
}
@ -1029,7 +1029,7 @@ static void test_ROT(void)
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface,
pMoniker, &dwCookie);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
IMoniker_Release(pMoniker);
@ -1245,7 +1245,7 @@ static void test_MkParseDisplayName(void)
eaten = 0xdeadbeef;
pmk = (IMoniker *)0xdeadbeef;
hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk);
todo_wine
todo_wine
ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr);
ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten);
ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk);
@ -1255,7 +1255,7 @@ todo_wine
eaten = 0xdeadbeef;
pmk = (IMoniker *)0xdeadbeef;
hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk);
todo_wine
todo_wine
ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr);
ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten);
ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk);
@ -1331,7 +1331,7 @@ todo_wine
eaten = 0xdeadbeef;
pmk = (IMoniker *)0xdeadbeef;
hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk);
todo_wine
todo_wine
ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr);
ok(eaten == 0, "Processed character count should have been 0 instead of %u\n", eaten);
ok(pmk == NULL, "Output moniker pointer should have been NULL instead of %p\n", pmk);
@ -1783,7 +1783,7 @@ static void test_moniker(
hr = IMoniker_GetSizeMax(moniker, &max_size);
ok(hr == S_OK, "Failed to get max size, hr %#x.\n", hr);
todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE)
todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE)
ok(expected_max_size == max_size.u.LowPart, "%s: unexpected max size %u.\n", testname, max_size.u.LowPart);
hr = IMoniker_Save(moniker, stream, TRUE);
@ -1926,7 +1926,7 @@ static void test_class_moniker(void)
{
eaten = 0xdeadbeef;
hr = MkParseDisplayName(bindctx, tests[i].name, &eaten, &moniker);
todo_wine_if(i == 5)
todo_wine_if(i == 5)
ok(hr == tests[i].hr, "%u: unexpected hr %#x.\n", i, hr);
ok(eaten == tests[i].eaten, "%u: unexpected eaten length %u, expected %u.\n", i, eaten, tests[i].eaten);
if (SUCCEEDED(hr))
@ -2101,7 +2101,7 @@ static void test_class_moniker(void)
ok(!enummoniker, "Unexpected pointer.\n");
hr = IMoniker_Enum(moniker, FALSE, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
IBindCtx_Release(bindctx);
@ -2223,7 +2223,7 @@ static void test_file_moniker(WCHAR* path)
ok(!enummoniker, "Unexpected pointer.\n");
hr = IMoniker_Enum(moniker1, FALSE, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
IBindCtx_Release(bind_ctx);
@ -2312,7 +2312,7 @@ static void test_file_monikers(void)
ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr);
check_interface(moniker, &IID_IMoniker, TRUE);
todo_wine
todo_wine
check_interface(moniker, &IID_IPersist, FALSE);
check_interface(moniker, &IID_IPersistStream, TRUE);
check_interface(moniker, &CLSID_FileMoniker, TRUE);
@ -2707,7 +2707,7 @@ static void test_item_moniker(void)
ok(!enummoniker, "Unexpected pointer.\n");
hr = IMoniker_Enum(moniker, FALSE, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = IMoniker_IsEqual(moniker, NULL);
@ -2872,7 +2872,7 @@ static void test_anti_moniker(void)
ok_ole_success(hr, CreateAntiMoniker);
check_interface(moniker, &IID_IMoniker, TRUE);
todo_wine
todo_wine
check_interface(moniker, &IID_IPersist, FALSE);
check_interface(moniker, &IID_IPersistStream, TRUE);
check_interface(moniker, &CLSID_AntiMoniker, TRUE);
@ -3037,7 +3037,7 @@ todo_wine
ok(!enummoniker, "Unexpected pointer.\n");
hr = IMoniker_Enum(moniker, FALSE, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
/* CommonPrefixWith() */
@ -3225,7 +3225,7 @@ static void test_generic_composite_moniker(void)
ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr);
check_interface(moniker, &IID_IMoniker, TRUE);
todo_wine
todo_wine
check_interface(moniker, &IID_IPersist, FALSE);
check_interface(moniker, &IID_IPersistStream, TRUE);
check_interface(moniker, &IID_IROTData, TRUE);
@ -3237,7 +3237,7 @@ todo_wine
/* Generic composite is special, as it does not addref in this case. */
hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown);
todo_wine
todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n");
@ -3338,14 +3338,14 @@ todo_wine
cookie = 0;
hr = IRunningObjectTable_Register(rot, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)moniker4,
moniker4, &cookie);
todo_wine
todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMoniker_BindToObject(moniker3, bindctx, moniker2, &IID_IMoniker, (void **)&unknown);
ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);
hr = IRunningObjectTable_Revoke(rot, cookie);
todo_wine
todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
IMoniker_Release(moniker3);
@ -3480,7 +3480,7 @@ todo_wine
IMoniker_Release(moniker3);
hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3);
todo_wine
todo_wine
ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr);
if (SUCCEEDED(hr))
{
@ -3843,7 +3843,7 @@ static void test_pointer_moniker(void)
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
check_interface(moniker, &IID_IMoniker, TRUE);
todo_wine
todo_wine
check_interface(moniker, &IID_IPersist, FALSE);
check_interface(moniker, &IID_IPersistStream, TRUE);
check_interface(moniker, &CLSID_PointerMoniker, TRUE);
@ -4135,7 +4135,7 @@ static void test_objref_moniker(void)
hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2);
ok(hr == S_OK, "Failed to unmarshal, hr %#x\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2);
todo_wine
todo_wine
ok(hr == S_OK, "Expected equal moniker, hr %#x\n", hr);
IMoniker_Release(moniker2);
@ -4151,7 +4151,7 @@ todo_wine
ok(hr == S_OK, "CreateBindCtx failed: 0x%08x\n", hr);
hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name);
todo_wine
todo_wine
ok(hr == S_OK, "IMoniker_GetDisplayName failed: 0x%08x\n", hr);
IBindCtx_Release(bindctx);
@ -4170,7 +4170,7 @@ todo_wine
ok(hr == S_OK, "CreateStreamOnHGlobal failed: 0x%08x\n", hr);
hr = IMoniker_Save(moniker, stream, TRUE);
todo_wine
todo_wine
ok(hr == S_OK, "IMoniker_Save failed: 0x%08x\n", hr);
IStream_Release(stream);
@ -4184,7 +4184,7 @@ todo_wine
TEST_MONIKER_TYPE(moniker, MKSYS_OBJREFMONIKER);
hr = IMoniker_Inverse(moniker, &inverse);
todo_wine
todo_wine
ok(hr == S_OK, "Failed to get inverse, hr %#x\n", hr);
if (hr == S_OK)
{
@ -4197,38 +4197,38 @@ if (hr == S_OK)
/* IsRunning test */
hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr);
hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime);
ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr);
hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
todo_wine
todo_wine
ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr);
if (hr == S_OK)
IUnknown_Release(unknown);
if (hr == S_OK)
IUnknown_Release(unknown);
hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
todo_wine
todo_wine
ok(hr == S_OK, "IMoniker_BindToObject failed: 0x%08x\n", hr);
if (hr == S_OK)
IUnknown_Release(unknown);
if (hr == S_OK)
IUnknown_Release(unknown);
IMoniker_Release(moniker);
todo_wine
todo_wine
ok(factory.refcount > 1, "Unexpected factory refcount %u\n", factory.refcount);
hr = CreateObjrefMoniker(NULL, &moniker);
ok(hr == S_OK, "CreateObjrefMoniker failed, hr %#x\n", hr);
hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
todo_wine
todo_wine
ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr);
hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
todo_wine
todo_wine
ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr);
IBindCtx_Release(bindctx);
@ -4254,23 +4254,23 @@ todo_wine
ok(hr == S_OK, "CreateObjrefMoniker failed: hr %#x\n", hr);
hr = IMoniker_IsEqual(moniker, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2);
todo_wine
todo_wine
ok(hr == S_OK, "Unexpected hr %#x\n", hr);
hr = IMoniker_CommonPrefixWith(moniker, moniker2, NULL);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr);
hr = IMoniker_CommonPrefixWith(moniker, NULL, &prefix);
todo_wine
todo_wine
ok(hr == E_INVALIDARG, "Unexpected hr %#x\n", hr);
hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix);
todo_wine
todo_wine
ok(hr == MK_S_US, "Unexpected hr %#x\n", hr);
if (hr == S_OK)
{
@ -4284,11 +4284,11 @@ if (hr == S_OK)
ok(hr == S_OK, "Failed to create moniker, hr %#x\n", hr);
hr = IMoniker_IsEqual(moniker, moniker2);
todo_wine
todo_wine
ok(hr == S_FALSE, "Unexpected hr %#x\n", hr);
hr = IMoniker_CommonPrefixWith(moniker, moniker2, &prefix);
todo_wine
todo_wine
ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x\n", hr);
IMoniker_Release(moniker2);
@ -4298,16 +4298,16 @@ todo_wine
/* P + A -> () */
anti = create_antimoniker(1);
hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2);
todo_wine
todo_wine
ok(hr == S_OK, "Failed to compose, hr %#x\n", hr);
if (hr == S_OK)
ok(!moniker2, "Unexpected pointer\n");
if (hr == S_OK)
ok(!moniker2, "Unexpected pointer\n");
IMoniker_Release(anti);
/* P + A2 -> A */
anti = create_antimoniker(2);
hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2);
todo_wine
todo_wine
ok(hr == S_OK, "Failed to compose, hr %#x\n", hr);
if (hr == S_OK)
{

12
dlls/ole32/tests/ole2.c
View File

@ -3209,7 +3209,7 @@ static HRESULT WINAPI Storage_CreateStream(IStorage *iface, LPCOLESTR pwcsName,
}
else
{
todo_wine
todo_wine
ok(0, "unexpected stream name %s\n", wine_dbgstr_w(pwcsName));
#if 0 /* FIXME: return NULL once Wine is fixed */
*ppstm = NULL;
@ -3677,11 +3677,11 @@ static void test_data_cache_save(void)
hr = IPersistStorage_Save(stg, &Storage, FALSE);
ok(hr == S_OK, "unexpected %#x\n", hr);
CHECK_CALLED(Storage_CreateStream_OlePres);
todo_wine
todo_wine
CHECK_CALLED(Storage_OpenStream_OlePres);
todo_wine
todo_wine
CHECK_CALLED(Storage_OpenStream_Ole);
todo_wine
todo_wine
CHECK_CALLED(Storage_DestroyElement);
IStream_Release(olepres_stream);
@ -4456,10 +4456,10 @@ static void test_data_cache_contents(void)
enumerated_streams = matched_streams = -1;
check_storage_contents(doc2, test_data[i].out, &enumerated_streams, &matched_streams);
todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2))
todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2))
ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i,
enumerated_streams, matched_streams);
todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5
todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5
|| test_data[i].in == &stg_def_6))
ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i,
enumerated_streams, test_data[i].out->stream_count);

4
dlls/ole32/tests/ole_server.c
View File

@ -472,11 +472,11 @@ START_TEST(ole_server)
trace("call OleRun\n");
hr = OleRun(unknown);
trace("ret OleRun\n");
todo_wine
todo_wine
ok(hr == S_OK, "OleRun error %#x\n", hr);
ret = IRunnableObject_IsRunning(runobj);
todo_wine
todo_wine
ok(ret == 1, "expected 1, got %d\n", ret);
trace("call IRunnableObject_Release\n");

10
dlls/ole32/tests/stg_prop.c
View File

@ -650,7 +650,7 @@ static void test_propertyset_storage_enum(void)
hr = IPropertyStorage_Stat(prop_storage, &psstg);
ok(hr == S_OK, "Failed to get prop storage stats, hr %#x.\n", hr);
todo_wine
todo_wine
ok(IsEqualCLSID(&psstg.clsid, &IID_IUnknown), "Unexpected storage clsid %s.\n", wine_dbgstr_guid(&psstg.clsid));
hr = IPropertySetStorage_Enum(ps_storage, NULL);
@ -671,7 +671,7 @@ todo_wine
memset(&ftime, 0, sizeof(ftime));
ftime.dwLowDateTime = 1;
hr = IPropertyStorage_SetTimes(prop_storage, NULL, NULL, &ftime);
todo_wine
todo_wine
ok(hr == S_OK, "Failed to set storage times, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Reset(ps_enum);
@ -703,10 +703,10 @@ todo_wine
hr = IEnumSTATPROPSETSTG_Reset(ps_enum);
ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 2);
todo_wine
todo_wine
ok(hr == S_FALSE, "Failed to skip, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched);
todo_wine
todo_wine
ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Reset(ps_enum);
@ -714,7 +714,7 @@ todo_wine
hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 1);
ok(hr == S_OK, "Failed to skip, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched);
todo_wine
todo_wine
ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr);
hr = IEnumSTATPROPSETSTG_Reset(ps_enum);

4
dlls/ole32/tests/usrmarshal.c
View File

@ -720,7 +720,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx, BOOL client,
IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos);
marshal_size = pos.u.LowPart;
marshal_data = GlobalLock(h);
todo_wine
todo_wine
ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs);
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx);
@ -729,7 +729,7 @@ todo_wine
buffer = HeapAlloc(GetProcessHeap(), 0, size);
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx);
buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown);
todo_wine
todo_wine
ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs);
wireip = buffer;