Module: wine Branch: master Commit: db8e63af27b75d098db6f9a61a6fb0ab7d70d83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8e63af27b75d098db6f9a61a...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Wed May 7 15:44:48 2008 -0700
kernel32: Fix process tests to pass in Windows.
---
dlls/kernel32/tests/process.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fbf13b0..3a3743a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -470,7 +470,8 @@ static void test_Startup(void) GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); - okChildString("StartupInfoA", "lpTitle", si.lpTitle); + ok (si.lpTitle == NULL || !strncmp(si.lpTitle, selfname, strlen(selfname)), + "StartupInfoA:lpTitle expected something starting with '%s' or null, got '%s'\n", selfname, si.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -622,7 +623,8 @@ static void test_Startup(void)
okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); - okChildString("StartupInfoA", "lpTitle", si.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1041,7 +1043,8 @@ static void test_SuspendFlag(void)
okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1091,7 +1094,8 @@ static void test_DebuggingFlag(void)
okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1195,7 +1199,8 @@ static void test_Console(void)
okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); - okChildString("StartupInfoA", "lpTitle", startup.lpTitle); + ok (startup.lpTitle == NULL || !strcmp(startup.lpTitle, selfname), + "StartupInfoA:lpTitle expected '%s' or null, got '%s'\n", selfname, startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize); @@ -1230,7 +1235,7 @@ static void test_Console(void) ok(cpOutC == 1252, "Wrong console-SB CP (expected 1252 got %d/%d)\n", cpOutC, cpOut); ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n"); - ok(sbiC.dwCursorPosition.X == (sbi.dwCursorPosition.X ^ 1), "Wrong cursor position\n"); + trace("cursor position(X): %d/%d\n",sbi.dwCursorPosition.X, sbiC.dwCursorPosition.X); ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n");
release_memory();
-
Alexandre Julliard