[ros-diffs] [jimtabor] 54253: - Fix crash in cursoricon test.
jimtabor at svn.reactos.org
jimtabor at svn.reactos.org
Tue Oct 25 02:14:40 UTC 2011
Author: jimtabor
Date: Tue Oct 25 02:14:38 2011
New Revision: 54253
URL: http://svn.reactos.org/svn/reactos?rev=54253&view=rev
Log:
- Fix crash in cursoricon test.
Modified:
trunk/reactos/dll/win32/user32/misc/stubs.c
trunk/reactos/dll/win32/user32/user32.pspec
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stubs.c?rev=54253&r1=54252&r2=54253&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Oct 25 02:14:38 2011
@@ -554,6 +554,7 @@
CreateSystemThreads(DWORD dwUnknown)
{
NtUserxCreateSystemThreads(dwUnknown);
+ ExitThread(0);
}
BOOL
@@ -572,12 +573,13 @@
return FALSE;
}
-BOOL
-WINAPI
-GetCursorFrameInfo(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5)
-{
- UNIMPLEMENTED;
- return FALSE;
+HCURSOR
+WINAPI
+GetCursorFrameInfo(HCURSOR hCursor, LPCWSTR name, DWORD istep, PDWORD rate_jiffies, INT *num_steps)
+{
+ if (hCursor) return NtUserGetCursorFrameInfo(hCursor, istep, rate_jiffies, num_steps);
+
+ return LoadImageW( NULL, name, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE );
}
BOOL
Modified: trunk/reactos/dll/win32/user32/user32.pspec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.pspec?rev=54253&r1=54252&r2=54253&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Tue Oct 25 02:14:38 2011
@@ -268,7 +268,7 @@
@ stdcall GetClipboardViewer() NtUserGetClipboardViewer
@ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo
@ stdcall GetCursor()
-@ stub GetCursorFrameInfo
+@ stdcall GetCursorFrameInfo(long long long ptr ptr)
@ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo
@ stdcall GetCursorPos(ptr)
@ stdcall GetDC(long) NtUserGetDC
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=54253&r1=54252&r2=54253&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 25 02:14:38 2011
@@ -1907,13 +1907,13 @@
GETCPD Flags,
ULONG_PTR Proc);
-DWORD
+HCURSOR
NTAPI
NtUserGetCursorFrameInfo(
- DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2,
- DWORD Unknown3);
+ HCURSOR hCursor,
+ DWORD istep,
+ PDWORD rate_jiffies,
+ INT *num_steps);
BOOL
NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c?rev=54253&r1=54252&r2=54253&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Oct 25 02:14:38 2011
@@ -1242,13 +1242,13 @@
/*
* @unimplemented
*/
-DWORD
-APIENTRY
+HCURSOR
+NTAPI
NtUserGetCursorFrameInfo(
- DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2,
- DWORD Unknown3)
+ HCURSOR hCursor,
+ DWORD istep,
+ PDWORD rate_jiffies,
+ INT *num_steps)
{
STUB
More information about the Ros-diffs
mailing list