[Win32ss]

- Cleanup and remove unused code.

svn path=/trunk/; revision=66364
This commit is contained in:
James Tabor 2015-02-20 06:24:04 +00:00
parent b1c86da173
commit 25b96c6299
7 changed files with 0 additions and 94 deletions

View file

@ -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

View file

@ -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

View file

@ -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));

View file

@ -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);

View file

@ -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);

View file

@ -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

View file

@ -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:
{