From 25b96c62997c1756c9fa693189b175e1211793ce Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 20 Feb 2015 06:24:04 +0000
Subject: [PATCH] [Win32ss] - Cleanup and remove unused code.

svn path=/trunk/; revision=66364
---
 reactos/win32ss/include/ntuser.h              |  1 -
 reactos/win32ss/user/ntuser/caret.c           | 20 --------
 reactos/win32ss/user/ntuser/simplecall.c      |  3 --
 .../win32ss/user/user32/include/ntwrapper.h   |  5 --
 reactos/win32ss/user/user32/include/user32p.h |  1 -
 reactos/win32ss/user/user32/windows/caret.c   | 48 -------------------
 reactos/win32ss/user/user32/windows/defwnd.c  | 16 -------
 7 files changed, 94 deletions(-)

diff --git a/reactos/win32ss/include/ntuser.h b/reactos/win32ss/include/ntuser.h
index 10faba26550..e79edf551c1 100644
--- a/reactos/win32ss/include/ntuser.h
+++ b/reactos/win32ss/include/ntuser.h
@@ -3509,7 +3509,6 @@ NtUserYieldTask(VOID);
  */
 
 #define NOPARAM_ROUTINE_ISCONSOLEMODE             0xffff0001
-#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING       0xfffe0008
 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING     0xfffe000d
 #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING        0xfffe000e
 #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT         0xfffd0050
diff --git a/reactos/win32ss/user/ntuser/caret.c b/reactos/win32ss/user/ntuser/caret.c
index f2bd1d64eb3..99c2d465956 100644
--- a/reactos/win32ss/user/ntuser/caret.c
+++ b/reactos/win32ss/user/ntuser/caret.c
@@ -278,26 +278,6 @@ BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL)
    return TRUE;
 }
 
-/* This can go away now! */
-BOOL FASTCALL
-IntSwitchCaretShowing(PVOID Info)
-{
-   PTHREADINFO pti;
-   PUSER_MESSAGE_QUEUE ThreadQueue;
-
-   pti = PsGetCurrentThreadWin32Thread();
-   ThreadQueue = pti->MessageQueue;
-
-   if(ThreadQueue->CaretInfo->hWnd)
-   {
-      ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1);
-      MmCopyToCaller(Info, ThreadQueue->CaretInfo, sizeof(THRDCARETINFO));
-      return TRUE;
-   }
-
-   return FALSE;
-}
-
 /* SYSCALLS *****************************************************************/
 
 BOOL
diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
index eaa946789b7..22e40d5b96c 100644
--- a/reactos/win32ss/user/ntuser/simplecall.c
+++ b/reactos/win32ss/user/ntuser/simplecall.c
@@ -218,9 +218,6 @@ NtUserCallOneParam(
             RETURN(Result);
          }
 
-      case ONEPARAM_ROUTINE_SWITCHCARETSHOWING:
-         RETURN( (DWORD_PTR)IntSwitchCaretShowing((PVOID)Param));
-
       case ONEPARAM_ROUTINE_SETCARETBLINKTIME:
          RETURN( (DWORD_PTR)IntSetCaretBlinkTime((UINT)Param));
 
diff --git a/reactos/win32ss/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
index 463d403074d..c77f4cf8f72 100644
--- a/reactos/win32ss/user/user32/include/ntwrapper.h
+++ b/reactos/win32ss/user/user32/include/ntwrapper.h
@@ -791,11 +791,6 @@ EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID)
     return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
 }
 
-EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo)
-{
-    return (BOOL)NtUserCallOneParam((DWORD_PTR)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING);
-}
-
 EXTINLINE VOID NtUserxEnableProcessWindowGhosting(BOOL bEnable)
 {
     NtUserCallOneParam((DWORD_PTR)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING);
diff --git a/reactos/win32ss/user/user32/include/user32p.h b/reactos/win32ss/user/user32/include/user32p.h
index e27efcf3cea..8e29ab41d05 100644
--- a/reactos/win32ss/user/user32/include/user32p.h
+++ b/reactos/win32ss/user/user32/include/user32p.h
@@ -129,7 +129,6 @@ void UserGetInsideRectNC(PWND Wnd, RECT *rect);
 VOID FASTCALL GetConnected(VOID);
 extern BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, BOOL Desktops);
 extern BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, BOOL Desktops);
-void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo);
 BOOL UserDrawSysMenuButton( HWND hWnd, HDC hDC, LPRECT, BOOL down );
 HWND* WIN_ListChildren (HWND hWndparent);
 VOID DeleteFrameBrushes(VOID);
diff --git a/reactos/win32ss/user/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
index 6b3b16cfc58..343c38d1212 100644
--- a/reactos/win32ss/user/user32/windows/caret.c
+++ b/reactos/win32ss/user/user32/windows/caret.c
@@ -34,54 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* FUNCTIONS *****************************************************************/
 
-void
-DrawCaret(HWND hWnd,
-          PTHRDCARETINFO CaretInfo)
-{
-    HDC hdc, hdcMem;
-    HBITMAP hbmOld;
-    BOOL bDone = FALSE;
-
-    hdc = GetDC(hWnd);
-    if (!hdc)
-    {
-        ERR("GetDC failed\n");
-        return;
-    }
-
-    if(CaretInfo->Bitmap && GetBitmapDimensionEx(CaretInfo->Bitmap, &CaretInfo->Size))
-    {
-        hdcMem = CreateCompatibleDC(hdc);
-        if (hdcMem)
-        {
-            hbmOld = SelectObject(hdcMem, CaretInfo->Bitmap);
-            bDone = BitBlt(hdc,
-                           CaretInfo->Pos.x,
-                           CaretInfo->Pos.y,
-                           CaretInfo->Size.cx,
-                           CaretInfo->Size.cy,
-                           hdcMem,
-                           0,
-                           0,
-                           SRCINVERT);
-            SelectObject(hdcMem, hbmOld);
-            DeleteDC(hdcMem);
-        }
-    }
-
-    if (!bDone)
-    {
-        PatBlt(hdc,
-               CaretInfo->Pos.x,
-               CaretInfo->Pos.y,
-               CaretInfo->Size.cx,
-               CaretInfo->Size.cy,
-               DSTINVERT);
-    }
-
-    ReleaseDC(hWnd, hdc);
-}
-
 
 /*
  * @implemented
diff --git a/reactos/win32ss/user/user32/windows/defwnd.c b/reactos/win32ss/user/user32/windows/defwnd.c
index 8d07c8b769b..a24fab18270 100644
--- a/reactos/win32ss/user/user32/windows/defwnd.c
+++ b/reactos/win32ss/user/user32/windows/defwnd.c
@@ -967,22 +967,6 @@ User32DefWindowProc(HWND hWnd,
             break;
         }
 
-        case WM_SYSTIMER:
-        {
-          THRDCARETINFO CaretInfo;
-          switch(wParam)
-          {
-            case 0xffff: /* Caret timer */
-              /* switch showing byte in win32k and get information about the caret */
-              if(NtUserxSwitchCaretShowing(&CaretInfo) && (CaretInfo.hWnd == hWnd))
-              {
-                DrawCaret(hWnd, &CaretInfo);
-              }
-              break;
-          }
-          break;
-        }
-
         case WM_QUERYOPEN:
         case WM_QUERYENDSESSION:
         {