From 8fdf8589f9118747de7a88d36d3325fc910f6ca4 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 30 Apr 2008 17:39:07 -0700 Subject: [PATCH 2/5] userenv: add more tests for environment variables for CreateEnvironmentBlock. --- dlls/userenv/tests/userenv.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index e7f691d..0923774 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -178,6 +178,13 @@ static void test_create_env(void) { "ProgramFiles", { 1, 1, 0, 0 } }, { 0, { 0, 0, 0, 0 } } }; + static const struct profile_item htok_vars[] = { + { "PATH", { 1, 1, 0, 0 } }, + { "TEMP", { 1, 1, 0, 0 } }, + { "TMP", { 1, 1, 0, 0 } }, + { "USERPROFILE", { 1, 1, 0, 0 } }, + { 0, { 0, 0, 0, 0 } } + }; r = CreateEnvironmentBlock(NULL, NULL, FALSE); expect(FALSE, r); @@ -230,6 +237,37 @@ static void test_create_env(void) expect_env(TRUE, r, common_vars[i].name); i++; } + + /* Test for environment variables with values that depends on htok */ + i = 0; + while (htok_vars[i].name) + { + j = 0; + r = get_env(env1, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env2, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env3, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + j++; + r = get_env(env4, htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + i++; + } } START_TEST(userenv) -- 1.5.2.2