Windows 98 test fix - dlls/kernel/tests/environ.c

Jakob Eriksson jakov at vmlinux.org
Mon Mar 21 08:32:32 CST 2005


http://test.winehq.org/data/200503181000/98_jmelgarejo98casa/kernel32:environ.txt

If the variable does not exist, just return.


regards,
Jakob

-------------- next part --------------
Index: dlls/kernel/tests/environ.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/environ.c,v
retrieving revision 1.9
diff -u -r1.9 environ.c
--- dlls/kernel/tests/environ.c	15 Mar 2005 19:33:32 -0000	1.9
+++ dlls/kernel/tests/environ.c	21 Mar 2005 14:30:23 -0000
@@ -220,10 +220,9 @@
     ret_size1 = GetWindowsDirectoryA(buf1,256);
     ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n");
     ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf));
-    error = GetLastError();
-    ok(!strcmp(buf, buf1),
-       "ExpandEnvironmentStrings failed %s vs %s. GetLastError() == %d, ret_size = %ld\n",
-       buf, buf1, error, ret_size);
+    if (ERROR_ENVVAR_NOT_FOUND == GetLastError())
+        return;
+    ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %ld\n", buf, buf1, ret_size);
 }
 
 START_TEST(environ)


More information about the wine-patches mailing list