Francois Gouget : kernel32/tests: Test the expansion of indirect environment variable references.
Alexandre Julliard
julliard at winehq.org
Wed Jan 23 14:36:46 CST 2008
Module: wine
Branch: master
Commit: e7e998004ac239658e1735d412fa3d35cecfbf8d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e998004ac239658e1735d412fa3d35cecfbf8d
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Jan 23 15:16:53 2008 +0100
kernel32/tests: Test the expansion of indirect environment variable references.
---
dlls/kernel32/tests/environ.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index 5f85f5d..632e3bc 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -274,9 +274,19 @@ static void test_ExpandEnvironmentStringsA(void)
ret_size1 = GetWindowsDirectoryA(buf1,256);
ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n");
ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf));
- if (ERROR_ENVVAR_NOT_FOUND == GetLastError())
- return;
- ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size);
+ if (ERROR_ENVVAR_NOT_FOUND != GetLastError())
+ {
+ ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size);
+ }
+
+ /* Try with a variable that references another */
+ SetEnvironmentVariableA("IndirectVar", "Foo%EnvVar%Bar");
+ strcpy(buf, "Indirect-%IndirectVar%-Indirect");
+ strcpy(buf2, "Indirect-Foo%EnvVar%Bar-Indirect");
+ ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1));
+ ok(ret_size == strlen(buf2)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, strlen(buf2)+1);
+ ok(!strcmp(buf1, buf2), "ExpandEnvironmentStrings returned [%s]\n", buf1);
+ SetEnvironmentVariableA("IndirectVar", NULL);
SetEnvironmentVariableA("EnvVar", NULL);
}
More information about the wine-cvs
mailing list