Add trailing '\n's to ok() calls.
This commit is contained in:
parent
4f634a3b7a
commit
c7dcf642ea
|
@ -89,7 +89,7 @@ static void FillRoot(void)
|
||||||
assert(hChild);
|
assert(hChild);
|
||||||
AddItem('.');
|
AddItem('.');
|
||||||
|
|
||||||
ok(!strcmp(sequence, "AB."), "Item creation");
|
ok(!strcmp(sequence, "AB."), "Item creation\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void DoTest1(void)
|
static void DoTest1(void)
|
||||||
|
@ -107,7 +107,7 @@ static void DoTest1(void)
|
||||||
AddItem('5');
|
AddItem('5');
|
||||||
TreeView_SelectItem(hTree, hRoot);
|
TreeView_SelectItem(hTree, hRoot);
|
||||||
AddItem('.');
|
AddItem('.');
|
||||||
ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test");
|
ok(!strcmp(sequence, "1(nR)nR23(Rn)Rn45(nR)nR."), "root-none select test\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void DoTest2(void)
|
static void DoTest2(void)
|
||||||
|
@ -125,7 +125,7 @@ static void DoTest2(void)
|
||||||
AddItem('5');
|
AddItem('5');
|
||||||
TreeView_SelectItem(hTree, hRoot);
|
TreeView_SelectItem(hTree, hRoot);
|
||||||
AddItem('.');
|
AddItem('.');
|
||||||
ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test");
|
ok(!strcmp(sequence, "1(nR)nR23(RC)RC45(CR)CR."), "root-child select test\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
|
@ -270,7 +270,7 @@ static BOOL CALLBACK EnumJoysticks(
|
||||||
break;
|
break;
|
||||||
trace("X%5ld Y%5ld Z%5ld Rx%5ld Ry%5ld Rz%5ld "
|
trace("X%5ld Y%5ld Z%5ld Rx%5ld Ry%5ld Rz%5ld "
|
||||||
"S0%5ld S1%5ld POV0%5ld POV1%5ld POV2%5ld POV3%5ld "
|
"S0%5ld S1%5ld POV0%5ld POV1%5ld POV2%5ld POV3%5ld "
|
||||||
"B %d %d %d %d %d %d %d %d %d %d %d %d\r",
|
"B %d %d %d %d %d %d %d %d %d %d %d %d\n",
|
||||||
js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz,
|
js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz,
|
||||||
js.rglSlider[0], js.rglSlider[1],
|
js.rglSlider[0], js.rglSlider[1],
|
||||||
js.rgdwPOV[0], js.rgdwPOV[1], js.rgdwPOV[2], js.rgdwPOV[3],
|
js.rgdwPOV[0], js.rgdwPOV[1], js.rgdwPOV[2], js.rgdwPOV[3],
|
||||||
|
|
|
@ -291,7 +291,7 @@ static void test_query_process(void)
|
||||||
|
|
||||||
last_pid = spi->dwProcessID;
|
last_pid = spi->dwProcessID;
|
||||||
|
|
||||||
ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\"");
|
ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n");
|
||||||
|
|
||||||
/* Loop through the threads, skip NT4 for now */
|
/* Loop through the threads, skip NT4 for now */
|
||||||
|
|
||||||
|
|
|
@ -4714,12 +4714,12 @@ if (HAVE_OLEAUT32_I8) {
|
||||||
V_UI1(&right) = 9;
|
V_UI1(&right) = 9;
|
||||||
|
|
||||||
hres = VarMul(&cy, &right, &result);
|
hres = VarMul(&cy, &right, &result);
|
||||||
ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n'", vtstr(V_VT(&result)));
|
ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result)));
|
||||||
hres = VarR8FromCy(V_CY(&result), &r);
|
hres = VarR8FromCy(V_CY(&result), &r);
|
||||||
ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399);
|
ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399);
|
||||||
|
|
||||||
hres = VarMul(&left, &dec, &result);
|
hres = VarMul(&left, &dec, &result);
|
||||||
ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n'", vtstr(V_VT(&result)));
|
ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result)));
|
||||||
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
|
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
|
||||||
ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2);
|
ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2);
|
||||||
}
|
}
|
||||||
|
@ -4897,7 +4897,7 @@ static void test_VarAdd(void)
|
||||||
V_VT(&right) = VT_BSTR;
|
V_VT(&right) = VT_BSTR;
|
||||||
V_BSTR(&right) = rbstr;
|
V_BSTR(&right) = rbstr;
|
||||||
hres = VarAdd(&left, &right, &result);
|
hres = VarAdd(&left, &right, &result);
|
||||||
ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n'", vtstr(V_VT(&result)));
|
ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result)));
|
||||||
hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r);
|
hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r);
|
||||||
ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212);
|
ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212);
|
||||||
|
|
||||||
|
@ -4916,12 +4916,12 @@ static void test_VarAdd(void)
|
||||||
V_UI1(&right) = 9;
|
V_UI1(&right) = 9;
|
||||||
|
|
||||||
hres = VarAdd(&cy, &right, &result);
|
hres = VarAdd(&cy, &right, &result);
|
||||||
ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n'", vtstr(V_VT(&result)));
|
ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result)));
|
||||||
hres = VarR8FromCy(V_CY(&result), &r);
|
hres = VarR8FromCy(V_CY(&result), &r);
|
||||||
ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720);
|
ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720);
|
||||||
|
|
||||||
hres = VarAdd(&left, &dec, &result);
|
hres = VarAdd(&left, &dec, &result);
|
||||||
ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n'", vtstr(V_VT(&result)));
|
ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result)));
|
||||||
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
|
hres = VarR8FromDec(&V_DECIMAL(&result), &r);
|
||||||
ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2);
|
ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,11 +150,11 @@ static void test_GetMappedFileName(void)
|
||||||
if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath))))
|
if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath))))
|
||||||
return;
|
return;
|
||||||
ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%ld\n", szMapPath, ret);
|
ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%ld\n", szMapPath, ret);
|
||||||
ok(szMapPath[0] == '\\', "szMapPath=\"%s\"", szMapPath);
|
ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath);
|
||||||
szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */
|
szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */
|
||||||
if(!szMapBaseName || !*szMapBaseName)
|
if(!szMapBaseName || !*szMapBaseName)
|
||||||
{
|
{
|
||||||
ok(0, "szMapPath=\"%s\"", szMapPath);
|
ok(0, "szMapPath=\"%s\"\n", szMapPath);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
|
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
|
||||||
|
@ -211,7 +211,7 @@ static void test_GetModuleFileNameEx(void)
|
||||||
ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%ld\n", szModExPath, ret);
|
ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%ld\n", szModExPath, ret);
|
||||||
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
|
GetModuleFileNameA(NULL, szModPath, sizeof(szModPath));
|
||||||
ok(!strncmp(szModExPath, szModPath, MAX_PATH),
|
ok(!strncmp(szModExPath, szModPath, MAX_PATH),
|
||||||
"szModExPath=\"%s\" szModPath=\"%s\"", szModExPath, szModPath);
|
"szModExPath=\"%s\" szModPath=\"%s\"\n", szModExPath, szModPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_GetModuleBaseName(void)
|
static void test_GetModuleBaseName(void)
|
||||||
|
@ -250,7 +250,7 @@ static void test_ws_functions(void)
|
||||||
|
|
||||||
if(!VirtualLock(addr, 1))
|
if(!VirtualLock(addr, 1))
|
||||||
{
|
{
|
||||||
trace("locking failed (error=%ld) - skipping test", GetLastError());
|
trace("locking failed (error=%ld) - skipping test\n", GetLastError());
|
||||||
goto free_page;
|
goto free_page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -222,7 +222,7 @@ static void test_menu_ownerdraw(void)
|
||||||
MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE);
|
MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE);
|
||||||
/* and height */
|
/* and height */
|
||||||
ok( MOD_rc[0].bottom - MOD_rc[0].top == MOD_SIZE,
|
ok( MOD_rc[0].bottom - MOD_rc[0].top == MOD_SIZE,
|
||||||
"Height is incorrect. Got %ld expected %d",
|
"Height is incorrect. Got %ld expected %d\n",
|
||||||
MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE);
|
MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE);
|
||||||
|
|
||||||
/* test width/height of a OD menu bar as well */
|
/* test width/height of a OD menu bar as well */
|
||||||
|
|
|
@ -3078,7 +3078,7 @@ static void test_IsWindowUnicode(void)
|
||||||
|
|
||||||
ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n");
|
ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n");
|
||||||
SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcW);
|
SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcW);
|
||||||
ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE");
|
ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n");
|
||||||
|
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue