Alexandre Julliard : user32: Return fake global information in GetCursorInfo instead of thread-local values .
Alexandre Julliard
julliard at winehq.org
Fri Mar 19 11:16:36 CDT 2010
Module: wine
Branch: master
Commit: c83ea46e1aaf8f8ca130cfe70435daf388b57daf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83ea46e1aaf8f8ca130cfe70435daf388b57daf
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Mar 19 11:31:26 2010 +0100
user32: Return fake global information in GetCursorInfo instead of thread-local values.
---
dlls/user32/input.c | 4 ++--
dlls/user32/tests/cursoricon.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index 22d236e..f14590d 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -208,8 +208,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt )
BOOL WINAPI GetCursorInfo( PCURSORINFO pci )
{
if (!pci) return 0;
- if (get_user_thread_info()->cursor_count >= 0) pci->flags = CURSOR_SHOWING;
- else pci->flags = 0;
+ pci->hCursor = LoadCursorW( 0, (LPCWSTR)IDC_ARROW );
+ pci->flags = CURSOR_SHOWING;
GetCursorPos(&pci->ptScreenPos);
return 1;
}
diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 574d5cd..650e5fc 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -1529,7 +1529,7 @@ static void test_ShowCursor(void)
info.cbSize = sizeof(info);
ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" );
/* global show count is not affected since we don't have a window */
- todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" );
+ ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" );
}
parent_id = 0;
@@ -1582,7 +1582,7 @@ static void test_ShowCursor(void)
{
info.cbSize = sizeof(info);
ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" );
- todo_wine ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" );
+ ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" );
}
count = ShowCursor( TRUE );
More information about the wine-cvs
mailing list