Paul Vriens : kernel32: Fix return values of GetConsoleCursorInfo.
Alexandre Julliard
julliard at winehq.org
Tue Jun 24 06:47:19 CDT 2008
Module: wine
Branch: master
Commit: dd01d39f3b8aac237a332a153af8bebf5015d6fb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd01d39f3b8aac237a332a153af8bebf5015d6fb
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Tue Jun 24 12:23:07 2008 +0200
kernel32: Fix return values of GetConsoleCursorInfo.
---
dlls/kernel32/console.c | 10 +++++++++-
dlls/kernel32/tests/console.c | 3 ---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 21ce10a..a04ff26 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -2239,7 +2239,15 @@ BOOL WINAPI GetConsoleCursorInfo(HANDLE hCon, LPCONSOLE_CURSOR_INFO cinfo)
}
SERVER_END_REQ;
- TRACE("(%p) returning (%d,%d)\n", hCon, cinfo->dwSize, cinfo->bVisible);
+ if (!ret) return FALSE;
+
+ if (!cinfo)
+ {
+ SetLastError(ERROR_INVALID_ACCESS);
+ ret = FALSE;
+ }
+ else TRACE("(%p) returning (%d,%d)\n", hCon, cinfo->dwSize, cinfo->bVisible);
+
return ret;
}
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 2e0a78d..6eed56b 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -168,12 +168,9 @@ static void testCursorInfo(HANDLE hCon)
SetLastError(0xdeadbeef);
ret = GetConsoleCursorInfo(hCon, NULL);
- todo_wine
- {
ok(!ret, "Expected failure\n");
ok(GetLastError() == ERROR_INVALID_ACCESS, "GetLastError: expecting %u got %u\n",
ERROR_INVALID_ACCESS, GetLastError());
- }
}
static void testWriteSimple(HANDLE hCon, COORD sbSize)
More information about the wine-cvs
mailing list