=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: kernel32/tests: Fix crashes on win8 in console.

Alexandre Julliard julliard at winehq.org
Fri Nov 30 13:48:21 CST 2012


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

Author: André Hentschel <nerv at dawncrow.de>
Date:   Tue Nov 27 02:52:46 2012 +0100

kernel32/tests: Fix crashes on win8 in console.

---

 dlls/kernel32/tests/console.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 4b9cfb6..b1907d7 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -1354,12 +1354,12 @@ static void test_WriteConsoleInputA(HANDLE input_handle)
         LPDWORD written;
         DWORD expected_count;
         DWORD last_error;
-        int win7_crash;
+        int win_crash;
     } invalid_table[] =
     {
         {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE},
-        {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE},
@@ -1367,14 +1367,14 @@ static void test_WriteConsoleInputA(HANDLE input_handle)
         {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE},
         {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE},
-        {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE},
         {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE},
         {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
-        {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
@@ -1406,7 +1406,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle)
 
     for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
     {
-        if (invalid_table[i].win7_crash)
+        if (invalid_table[i].win_crash)
             continue;
 
         SetLastError(0xdeadbeef);
@@ -1597,12 +1597,12 @@ static void test_WriteConsoleInputW(HANDLE input_handle)
         LPDWORD written;
         DWORD expected_count;
         DWORD last_error;
-        int win7_crash;
+        int win_crash;
     } invalid_table[] =
     {
         {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE},
-        {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE},
@@ -1610,14 +1610,14 @@ static void test_WriteConsoleInputW(HANDLE input_handle)
         {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE},
         {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE},
-        {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE},
         {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE},
         {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
-        {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS},
+        {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS},
         {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
         {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
@@ -1649,7 +1649,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle)
 
     for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
     {
-        if (invalid_table[i].win7_crash)
+        if (invalid_table[i].win_crash)
             continue;
 
         SetLastError(0xdeadbeef);




More information about the wine-cvs mailing list