[ros-diffs] [jimtabor] 66364: [Win32ss] - Cleanup and remove unused code.

Author: jimtabor
Date: Fri Feb 20 06:24:04 2015
New Revision: 66364

URL: http://svn.reactos.org/svn/reactos?rev=66364&view=rev
Log:
[Win32ss]
- Cleanup and remove unused code.

Modified:
    trunk/reactos/win32ss/include/ntuser.h
    trunk/reactos/win32ss/user/ntuser/caret.c
    trunk/reactos/win32ss/user/ntuser/simplecall.c
    trunk/reactos/win32ss/user/user32/include/ntwrapper.h
    trunk/reactos/win32ss/user/user32/include/user32p.h
    trunk/reactos/win32ss/user/user32/windows/caret.c
    trunk/reactos/win32ss/user/user32/windows/defwnd.c

Modified: trunk/reactos/win32ss/include/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r…
==============================================================================
--- trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] Fri Feb 20 06:24:04 2015
@@ -3509,7 +3509,6 @@
  */
 
 #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

Modified: trunk/reactos/win32ss/user/ntuser/caret.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/caret.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/caret.c	[iso-8859-1] Fri Feb 20 06:24:04 2015
@@ -278,26 +278,6 @@
    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

Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] Fri Feb 20 06:24:04 2015
@@ -217,9 +217,6 @@
             gpsi->aiSysMet[SM_SWAPBUTTON] = gspv.bMouseBtnSwap;
             RETURN(Result);
          }
-
-      case ONEPARAM_ROUTINE_SWITCHCARETSHOWING:
-         RETURN( (DWORD_PTR)IntSwitchCaretShowing((PVOID)Param));
 
       case ONEPARAM_ROUTINE_SETCARETBLINKTIME:
          RETURN( (DWORD_PTR)IntSetCaretBlinkTime((UINT)Param));

Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] Fri Feb 20 06:24:04
2015
@@ -791,11 +791,6 @@
     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);

Modified: trunk/reactos/win32ss/user/user32/include/user32p.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/user32p.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/user32p.h	[iso-8859-1] Fri Feb 20 06:24:04
2015
@@ -129,7 +129,6 @@
 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);

Modified: trunk/reactos/win32ss/user/user32/windows/caret.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/caret.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/caret.c	[iso-8859-1] Fri Feb 20 06:24:04
2015
@@ -34,54 +34,6 @@
 
 /* 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

Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/defwnd.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/defwnd.c	[iso-8859-1] Fri Feb 20 06:24:04
2015
@@ -967,22 +967,6 @@
             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:
         {