diff --git a/dlls/user/display.c b/dlls/user/display.c
index 871885c4fe5..49bff977149 100644
--- a/dlls/user/display.c
+++ b/dlls/user/display.c
@@ -30,18 +30,18 @@ typedef struct tagCURSORINFO
 {
     WORD wXMickeys;
     WORD wYMickeys;
-} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
+} CURSORINFO16, *PCURSORINFO16, *LPCURSORINFO16;
 #include "poppack.h"
 
 /***********************************************************************
  *           Inquire			(DISPLAY.101)
  */
-WORD WINAPI DISPLAY_Inquire(LPCURSORINFO lpCursorInfo)
+WORD WINAPI DISPLAY_Inquire(LPCURSORINFO16 lpCursorInfo)
 {
     lpCursorInfo->wXMickeys = 1;
     lpCursorInfo->wYMickeys = 1;
 
-    return sizeof(CURSORINFO);
+    return sizeof(CURSORINFO16);
 }
 
 /***********************************************************************
@@ -91,4 +91,3 @@ VOID WINAPI UserRepaintDisable16( BOOL16 disable )
 {
     FIXME("stub\n");
 }
-
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index e814a2361d5..ed945e9131d 100644
--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -229,7 +229,7 @@ init	UserClientDllInitialize
 @ stdcall GetClipboardOwner() GetClipboardOwner
 @ stdcall GetClipboardViewer() GetClipboardViewer
 @ stdcall GetCursor() GetCursor
-@ stub GetCursorInfo
+@ stdcall GetCursorInfo(ptr) GetCursorInfo
 @ stdcall GetCursorPos(ptr) GetCursorPos
 @ stdcall GetDC(long) GetDC
 @ stdcall GetDCEx(long long long) GetDCEx
diff --git a/include/winuser.h b/include/winuser.h
index 3cbd01fa7e1..890134576db 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -1799,6 +1799,16 @@ typedef struct {
 } ICONINFO, *PICONINFO;
 
 
+typedef struct
+{
+    DWORD cbSize;
+    DWORD flags;
+    HCURSOR hCursor;
+    POINT ptScreenPos;
+} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
+
+#define CURSOR_SHOWING 0x00000001
+
 /* this is the 6 byte accel struct used in Win32 when presented to the user */
 typedef struct
 {
@@ -4019,28 +4029,29 @@ BOOL      WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,WNDCLASSEXW *);
 LONG        WINAPI GetClassLongA(HWND,INT);
 LONG        WINAPI GetClassLongW(HWND,INT);
 #define     GetClassLong WINELIB_NAME_AW(GetClassLong)
-INT       WINAPI GetClassNameA(HWND,LPSTR,INT);
-INT       WINAPI GetClassNameW(HWND,LPWSTR,INT);
+INT         WINAPI GetClassNameA(HWND,LPSTR,INT);
+INT         WINAPI GetClassNameW(HWND,LPWSTR,INT);
 #define     GetClassName WINELIB_NAME_AW(GetClassName)
 WORD        WINAPI GetClassWord(HWND,INT);
-BOOL      WINAPI GetClientRect(HWND,LPRECT);
-HANDLE    WINAPI GetClipboardData(UINT);
-INT       WINAPI GetClipboardFormatNameA(UINT,LPSTR,INT);
-INT       WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
+BOOL        WINAPI GetClientRect(HWND,LPRECT);
+HANDLE      WINAPI GetClipboardData(UINT);
+INT         WINAPI GetClipboardFormatNameA(UINT,LPSTR,INT);
+INT         WINAPI GetClipboardFormatNameW(UINT,LPWSTR,INT);
 #define     GetClipboardFormatName WINELIB_NAME_AW(GetClipboardFormatName)
-HWND      WINAPI GetClipboardOwner(void);
-HWND      WINAPI GetClipboardViewer(void);
-BOOL      WINAPI GetClipCursor(LPRECT);
-HCURSOR   WINAPI GetCursor(void);
-BOOL      WINAPI GetCursorPos(LPPOINT);
-HDC       WINAPI GetDC(HWND);
-HDC       WINAPI GetDCEx(HWND,HRGN,DWORD);
-HWND      WINAPI GetDesktopWindow(void);
-INT       WINAPI GetDlgCtrlID(HWND);
-HWND      WINAPI GetDlgItem(HWND,INT);
-UINT      WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
-INT       WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
-INT       WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
+HWND        WINAPI GetClipboardOwner(void);
+HWND        WINAPI GetClipboardViewer(void);
+BOOL        WINAPI GetClipCursor(LPRECT);
+HCURSOR     WINAPI GetCursor(void);
+BOOL        WINAPI GetCursorInfo(PCURSORINFO);
+BOOL        WINAPI GetCursorPos(LPPOINT);
+HDC         WINAPI GetDC(HWND);
+HDC         WINAPI GetDCEx(HWND,HRGN,DWORD);
+HWND        WINAPI GetDesktopWindow(void);
+INT         WINAPI GetDlgCtrlID(HWND);
+HWND        WINAPI GetDlgItem(HWND,INT);
+UINT        WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);
+INT         WINAPI GetDlgItemTextA(HWND,INT,LPSTR,UINT);
+INT         WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,UINT);
 #define     GetDlgItemText WINELIB_NAME_AW(GetDlgItemText)
 UINT      WINAPI GetDoubleClickTime(void);
 HWND      WINAPI GetFocus(void);
diff --git a/windows/input.c b/windows/input.c
index b4af406dec6..ccdc7b3ad08 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -476,6 +476,17 @@ BOOL WINAPI GetCursorPos( POINT *pt )
 }
 
 
+/***********************************************************************
+ *		GetCursorInfo (USER32.@)
+ */
+BOOL WINAPI GetCursorInfo( PCURSORINFO pci )
+{
+    if (!pci) return 0;
+    GetCursorPos(&pci->ptScreenPos);
+    return 1;
+}
+
+
 /***********************************************************************
  *		SetCursorPos (USER.70)
  */