Skip to content

W
wine-winehq
Commit 4a611ef5 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

oleaut32/tests: Avoid "misleading indentation" warnings.

Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 812944ec
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
dlls/oleaut32/tests/olefont.c
View file @ 4a611ef5
......@@ -1140,12 +1140,12 @@ static void test_hfont_lifetime(void)
EXPECT_HR(hr, S_OK);
hr = IFont_get_hFont(font2, &first_hfont);
EXPECT_HR(hr, S_OK);
todo_wine
todo_wine
ok(hfont == first_hfont, "fonts differ\n");
hr = IFont_ReleaseHfont(font, hfont);
EXPECT_HR(hr, S_OK);
hr = IFont_ReleaseHfont(font, hfont);
todo_wine
todo_wine
EXPECT_HR(hr, S_OK);
hr = IFont_ReleaseHfont(font, hfont);
EXPECT_HR(hr, S_FALSE);
......
dlls/oleaut32/tests/olepicture.c
View file @ 4a611ef5
......@@ -1178,18 +1178,18 @@ static void test_load_save_bmp(void)
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size);
ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
todo_wine
todo_wine
ok(size == 66, "expected 66, got %d\n", size);
mem = GlobalLock(hmem);
todo_wine
todo_wine
ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]);
GlobalUnlock(hmem);
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
todo_wine
todo_wine
ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr);
todo_wine
todo_wine
ok(size == -1, "expected -1, got %d\n", size);
offset.QuadPart = 0;
......@@ -1253,18 +1253,18 @@ static void test_load_save_icon(void)
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size);
ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
todo_wine
todo_wine
ok(size == 766, "expected 766, got %d\n", size);
mem = GlobalLock(hmem);
todo_wine
todo_wine
ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]);
GlobalUnlock(hmem);
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
todo_wine
todo_wine
ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr);
todo_wine
todo_wine
ok(size == -1, "expected -1, got %d\n", size);
offset.QuadPart = 0;
......@@ -1282,7 +1282,7 @@ todo_wine
mem = GlobalLock(hmem);
ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]);
todo_wine
todo_wine
ok(mem[1] == 766, "expected stream size 766, got %u\n", mem[1]);
ok(mem[2] == 0x00010000, "got wrong icon header %04x\n", mem[2]);
......@@ -1330,13 +1330,13 @@ static void test_load_save_empty_picture(void)
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size);
ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
todo_wine
todo_wine
ok(size == -1, "expected -1, got %d\n", size);
size = -1;
hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
todo_wine
todo_wine
ok(size == -1, "expected -1, got %d\n", size);
hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);
......
dlls/oleaut32/tests/safearray.c
View file @ 4a611ef5
......@@ -1996,9 +1996,9 @@ static void test_SafeArrayDestroyData (void)
ok(sa->pvData != NULL, "got %p\n", sa->pvData);
hres = SafeArrayDestroyData(sa);
ok(hres == S_OK, "got 0x%08x\n", hres);
todo_wine
todo_wine
ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures);
todo_wine
todo_wine
ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData);
/* There was a bug on windows, especially visible on 64bit systems,
probably double-free or similar issue. */
......
dlls/oleaut32/tests/tmarshal.c
View file @ 4a611ef5
......@@ -2329,7 +2329,7 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp)
V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &proxy_unk2;
hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
if (hr == S_OK) {
hr = IUnknown_QueryInterface(proxy_unk2, &IID_ISomethingFromDispatch, (void **)&proxy_sfd);
......@@ -2346,7 +2346,7 @@ if (hr == S_OK) {
proxy_disp = NULL;
hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_OUT, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!proxy_unk, "Got unexpected proxy %p.\n", proxy_unk);
ok(!proxy_disp, "Got unexpected proxy %p.\n", proxy_disp);
......@@ -2363,7 +2363,7 @@ todo_wine
V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out;
hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(unk_in == (IUnknown *)sfd1, "[in] parameter should not have changed.\n");
ok(!unk_out, "[out] parameter should have been cleared.\n");
......@@ -2380,7 +2380,7 @@ todo_wine
IUnknown_AddRef(unk_in_out);
hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
if (hr == S_OK) {
......@@ -2401,14 +2401,14 @@ if (hr == S_OK) {
release_iface(unk_in_out);
}
release_iface(sfd1);
todo_wine
todo_wine
release_iface(sfd3);
testmode = 2;
unk_in = unk_out = unk_in_out = NULL;
hr = IDispatch_Invoke(disp, DISPID_TM_IFACE_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!unk_out, "[out] parameter should not have been set.\n");
......@@ -2814,7 +2814,7 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp)
V_VT(&arg[0]) = VT_UNKNOWN|VT_BYREF; V_UNKNOWNREF(&arg[0]) = &unk_in_out;
hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(unk_in == (IUnknown *)&class1->ICoclass1_iface, "[in] parameter should not have changed.\n");
ok(!unk_out, "[out] parameter should have been cleared.\n");
......@@ -2831,7 +2831,7 @@ todo_wine
IUnknown_AddRef(unk_in_out);
hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
if (hr == S_OK) {
......@@ -2852,14 +2852,14 @@ if (hr == S_OK) {
release_iface(unk_in_out);
}
release_iface(&class1->ICoclass1_iface);
todo_wine
todo_wine
release_iface(&class3->ICoclass1_iface);
testmode = 2;
unk_in = unk_out = unk_in_out = NULL;
hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(!unk_out, "[out] parameter should not have been set.\n");
......@@ -2880,12 +2880,12 @@ if (hr == S_OK) {
IUnknown_AddRef(unk_in_out);
hr = IDispatch_Invoke(disp, DISPID_TM_COCLASS_PTR, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
todo_wine
todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine
todo_wine
ok(!unk_in_out, "[in, out] parameter should have been cleared.\n");
todo_wine
todo_wine
release_iface(&class3->ICoclass1_iface);
}
......
dlls/oleaut32/tests/typelib.c
View file @ 4a611ef5
......@@ -2933,7 +2933,7 @@ static void test_CreateTypeLib(SYSKIND sys) {
EXPECT_REF(dual, 2);
hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti);
ok(hres == S_OK, "got %08x\n", hres);
todo_wine
todo_wine
EXPECT_REF(dual, 3);
hres = ITypeInfo_GetTypeAttr(ti, &typeattr);
......@@ -2958,7 +2958,7 @@ todo_wine {
EXPECT_REF(dual, 4);
}
ITypeInfo_AddRef(ti_2);
todo_wine
todo_wine
EXPECT_REF(dual, 5);
ITypeInfo_Release(ti_2);
......
dlls/oleaut32/tests/usrmarshal.c
View file @ 4a611ef5
......@@ -568,7 +568,7 @@ static void test_marshal_LPSAFEARRAY(void)
next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
ok((next - buffer) <= size, "Marshaled %u bytes, expected at most %u\n", (ULONG) (next - buffer), size);
check_safearray(buffer, lpsa);
todo_wine
todo_wine
ok(heap_unknown[0]->refs == 3, "Unexpected refcount %d\n", heap_unknown[0]->refs);
lpsa2 = NULL;
......@@ -1612,7 +1612,7 @@ static void test_marshal_VARIANT(void)
stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength;
memset(buffer, 0xcc, stubMsg.BufferLength);
next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v);
todo_wine
todo_wine
ok(heap_unknown->refs == 2, "got refcount %d\n", heap_unknown->refs);
wirev = (DWORD*)buffer;
wirev = check_variant_header(wirev, &v, next - buffer);
......@@ -1630,7 +1630,7 @@ todo_wine
V_UNKNOWN(&v3) = &heap_unknown->IUnknown_iface;
IUnknown_AddRef(V_UNKNOWN(&v3));
stubMsg.Buffer = buffer;
todo_wine
todo_wine
ok(heap_unknown->refs == 3, "got refcount %d\n", heap_unknown->refs);
next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3);
ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3));
......@@ -1679,7 +1679,7 @@ todo_wine
memset(buffer, 0xcc, stubMsg.BufferLength);
ok(heap_unknown->refs == 1, "got refcount %d\n", heap_unknown->refs);
next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v);
todo_wine
todo_wine
ok(heap_unknown->refs == 2, "got refcount %d\n", heap_unknown->refs);
wirev = (DWORD*)buffer;
wirev = check_variant_header(wirev, &v, next - buffer);
......
dlls/oleaut32/vartype.c
View file @ 4a611ef5
......@@ -149,15 +149,15 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut,
/* Compiler cast where input cannot be negative */
#define NEGTST(dest, src, func) RETTYP _##func(src in, dest* out) { \
if (in < 0) return DISP_E_OVERFLOW; *out = in; return S_OK; }
if (in < 0) { return DISP_E_OVERFLOW; } *out = in; return S_OK; }
/* Compiler cast where input cannot be > some number */
#define POSTST(dest, src, func, tst) RETTYP _##func(src in, dest* out) { \
if (in > (dest)tst) return DISP_E_OVERFLOW; *out = in; return S_OK; }
if (in > (dest)tst) { return DISP_E_OVERFLOW; } *out = in; return S_OK; }
/* Compiler cast where input cannot be < some number or >= some other number */
#define BOTHTST(dest, src, func, lo, hi) RETTYP _##func(src in, dest* out) { \
if (in < (dest)lo || in > hi) return DISP_E_OVERFLOW; *out = in; return S_OK; }
if (in < (dest)lo || in > hi) { return DISP_E_OVERFLOW; } *out = in; return S_OK; }
/* I1 */
POSTST(signed char, BYTE, VarI1FromUI1, I1_MAX)
......
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