Paul Vriens : kernel32/tests: Don't crash on Vista.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 71054631b29d4ff5219fe9c016d9a20538d7ea14
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=71054631b29d4ff5219fe9c016...

Author: Paul Vriens 
Date:   Sat Jun 23 16:40:58 2007 +0200

kernel32/tests: Don't crash on Vista.

---

dlls/kernel32/tests/environ.c |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index bb9f745..3e65e92 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -201,15 +201,18 @@ static void test_GetSetEnvironmentVariableW(void)
        "should not find variable but ret_size=%d GetLastError=%d\n",
        ret_size, GetLastError());

-    ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1);
-    ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
-       "should not find variable but ret_size=%d GetLastError=%d\n",
-       ret_size, GetLastError());
-
-    ret = SetEnvironmentVariableW(NULL, NULL);
-    ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND),
-       "should fail with NULL, NULL but ret=%d and GetLastError=%d\n",
-       ret, GetLastError());
+    if (0) /* Both tests crash on Vista */
+    {
+        ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1);
+        ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND,
+           "should not find variable but ret_size=%d GetLastError=%d\n",
+           ret_size, GetLastError());
+
+        ret = SetEnvironmentVariableW(NULL, NULL);
+        ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND),
+           "should fail with NULL, NULL but ret=%d and GetLastError=%d\n",
+           ret, GetLastError());
+    }
 }

static void test_ExpandEnvironmentStringsA(void)