Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 04:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32 cleanup lite

Browse source 
redirect the InvalidateRect@12 to NtUserInvalidateRect@12 in the def file

nci tools changes (done of timo and me)
frist part moving the w32ksvc.db and sysfuncs.lst where they belong


svn path=/trunk/; revision=28055
This commit is contained in:
Magnus Olsen 2007-07-31 20:22:13 +00:00
parent 6428c40f66
commit 59bf5f271d
10 changed files with 39 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/dll/win32/user32/controls/button.c
View file

@ -400,7 +400,7 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam );
else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam );
if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */
InvalidateRect( hWnd, NULL, TRUE );
NtUserInvalidateRect( hWnd, NULL, TRUE );
else
paint_button( hWnd, btn_type, ODA_DRAWENTIRE );
return 1; /* success. FIXME: check text length */
@ -436,7 +436,7 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
break;
case WM_SYSCOLORCHANGE:
InvalidateRect( hWnd, NULL, FALSE );
NtUserInvalidateRect( hWnd, NULL, FALSE );
break;
#ifndef __REACTOS__
@ -473,8 +473,8 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
return 0;
}
oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam );
InvalidateRect( hWnd, NULL, FALSE );
return (LRESULT)oldHbitmap;
NtUserInvalidateRect( hWnd, NULL, FALSE );
return (LRESULT)oldHbitmap;
case BM_GETIMAGE:
return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET );

28
reactos/dll/win32/user32/controls/combo.c
View file

@ -1215,7 +1215,7 @@ BOOL COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL ok, BOOL bRedrawButton )
*/
static void CBRepaintButton( LPHEADCOMBO lphc )
{
InvalidateRect(lphc->self, &lphc->buttonRect, TRUE);
NtUserInvalidateRect(lphc->self, &lphc->buttonRect, TRUE);
UpdateWindow(lphc->self);
}
@ -1234,7 +1234,9 @@ static void COMBO_SetFocus( LPHEADCOMBO lphc )
/* lphc->wState |= CBF_FOCUSED; */
if( !(lphc->wState & CBF_EDIT) )
InvalidateRect(lphc->self, &lphc->textRect, TRUE);
{
NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE);
}
CB_NOTIFY( lphc, CBN_SETFOCUS );
lphc->wState |= CBF_FOCUSED;
@ -1256,11 +1258,11 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc )
if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST )
SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0);
lphc->wState &= ~CBF_FOCUSED;
lphc->wState &= ~CBF_FOCUSED;
/* redraw text */
if( !(lphc->wState & CBF_EDIT) )
InvalidateRect(lphc->self, &lphc->textRect, TRUE);
if( !(lphc->wState & CBF_EDIT) )
NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE);
CB_NOTIFY( lphc, CBN_KILLFOCUS );
}
@ -1278,12 +1280,12 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
switch( HIWORD(wParam) >> 8 )
{
case (EN_SETFOCUS >> 8):
case (EN_SETFOCUS >> 8):
TRACE("[%p]: edit [%p] got focus\n", lphc->self, lphc->hWndEdit );
COMBO_SetFocus( lphc );
break;
COMBO_SetFocus( lphc );
break;
case (EN_KILLFOCUS >> 8):
@ -1357,7 +1359,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));
}
else
InvalidateRect(lphc->self, &lphc->textRect, TRUE);
NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE);
}
/* do not roll up if selection is being tracked
@ -1679,7 +1681,7 @@ static LRESULT COMBO_SelectString( LPHEADCOMBO lphc, INT start, LPARAM pText, BO
CBUpdateEdit( lphc, index );
else
{
InvalidateRect(lphc->self, &lphc->textRect, TRUE);
NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE);
}
}
return (LRESULT)index;
@ -1988,7 +1990,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
EnableWindow( lphc->hWndLBox, (BOOL)wParam );
/* Force the control to repaint when the enabled state changes. */
InvalidateRect(lphc->self, NULL, TRUE);
NtUserInvalidateRect(lphc->self, NULL, TRUE);
return TRUE;
case WM_SETREDRAW:
if( wParam )
@ -2170,7 +2172,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW);
}
else
InvalidateRect(lphc->self, NULL, TRUE);
NtUserInvalidateRect(lphc->self, NULL, TRUE);
return TRUE;
case CB_INITSTORAGE:
return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
@ -2259,7 +2261,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
if( lphc->wState & CBF_EDIT )
CBUpdateEdit( lphc, (INT)wParam );
else
InvalidateRect(lphc->self, &lphc->textRect, TRUE);
NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE);
lphc->wState &= ~CBF_SELCHANGE;
return lParam;
#ifndef __REACTOS__

2
reactos/dll/win32/user32/controls/edit.c
View file

@ -5386,7 +5386,7 @@ static void EDIT_UpdateText(EDITSTATE *es, LPRECT rc, BOOL bErase)
es->flags &= ~EF_UPDATE;
EDIT_NOTIFY_PARENT(es, EN_UPDATE);
}
InvalidateRect(es->hwndSelf, rc, bErase);
NtUserInvalidateRect(es->hwndSelf, rc, bErase);
}
/********************************************************************

26
reactos/dll/win32/user32/controls/listbox.c
View file

@ -386,7 +386,7 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index,
else
scroll = FALSE;
}
if (!scroll) InvalidateRect( descr->self, NULL, TRUE );
if (!scroll) NtUserInvalidateRect( descr->self, NULL, TRUE );
descr->top_item = index;
LISTBOX_UpdateScroll( descr );
return LB_OKAY;
@ -408,7 +408,7 @@ static void LISTBOX_UpdatePage( LB_DESCR *descr )
if (page_size == descr->page_size) return;
descr->page_size = page_size;
if (descr->style & LBS_MULTICOLUMN)
InvalidateRect( descr->self, NULL, TRUE );
NtUserInvalidateRect( descr->self, NULL, TRUE );
LISTBOX_SetTopItem( descr, descr->top_item, FALSE );
}
@ -463,7 +463,7 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr )
/* Invalidate the focused item so it will be repainted correctly */
if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1)
{
InvalidateRect( descr->self, &rect, FALSE );
NtUserInvalidateRect( descr->self, &rect, FALSE );
}
}
@ -685,7 +685,7 @@ static void LISTBOX_SetRedraw( LB_DESCR *descr, BOOL on )
descr->style &= ~LBS_NOREDRAW;
if (descr->style & LBS_DISPLAYCHANGED)
{ /* page was changed while setredraw false, refresh automatically */
InvalidateRect(descr->self, NULL, TRUE);
NtUserInvalidateRect(descr->self, NULL, TRUE);
if ((descr->top_item + descr->page_size) > descr->nb_items)
{ /* reset top of page if less than number of items/page */
descr->top_item = descr->nb_items - descr->page_size;
@ -1198,14 +1198,14 @@ static void LISTBOX_InvalidateItems( LB_DESCR *descr, INT index )
return;
}
rect.bottom = descr->height;
InvalidateRect( descr->self, &rect, TRUE );
NtUserInvalidateRect( descr->self, &rect, TRUE );
if (descr->style & LBS_MULTICOLUMN)
{
/* Repaint the other columns */
rect.left = rect.right;
rect.right = descr->width;
rect.top = 0;
InvalidateRect( descr->self, &rect, TRUE );
NtUserInvalidateRect( descr->self, &rect, TRUE );
}
}
}
@ -1215,7 +1215,7 @@ static void LISTBOX_InvalidateItemRect( LB_DESCR *descr, INT index )
RECT rect;
if (LISTBOX_GetItemRect( descr, index, &rect ) == 1)
InvalidateRect( descr->self, &rect, TRUE );
NtUserInvalidateRect( descr->self, &rect, TRUE );
}
/***********************************************************************
@ -1267,7 +1267,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index,
LISTBOX_UpdatePage( descr );
LISTBOX_UpdateScroll( descr );
if (repaint)
InvalidateRect( descr->self, 0, TRUE );
NtUserInvalidateRect( descr->self, 0, TRUE );
}
return LB_OKAY;
}
@ -1292,12 +1292,12 @@ static void LISTBOX_SetHorizontalPos( LB_DESCR *descr, INT pos )
RECT rect;
/* Invalidate the focused item so it will be repainted correctly */
if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1)
InvalidateRect( descr->self, &rect, TRUE );
NtUserInvalidateRect( descr->self, &rect, TRUE );
ScrollWindowEx( descr->self, diff, 0, NULL, NULL, 0, NULL,
SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
}
else
InvalidateRect( descr->self, NULL, TRUE );
NtUserInvalidateRect( descr->self, NULL, TRUE );
}
@ -2646,7 +2646,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
case LB_RESETCONTENT:
LISTBOX_ResetContent( descr );
LISTBOX_UpdateScroll( descr );
InvalidateRect( descr->self, NULL, TRUE );
NtUserInvalidateRect( descr->self, NULL, TRUE );
return 0;
#ifndef __REACTOS__
@ -3158,7 +3158,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
return LISTBOX_Destroy( descr );
case WM_ENABLE:
InvalidateRect( hwnd, NULL, TRUE );
NtUserInvalidateRect( hwnd, NULL, TRUE );
return 0;
case WM_SETREDRAW:
@ -3184,7 +3184,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
return (LRESULT)descr->font;
case WM_SETFONT:
LISTBOX_SetFont( descr, (HFONT)wParam );
if (lParam) InvalidateRect( hwnd, 0, TRUE );
if (lParam) NtUserInvalidateRect( hwnd, 0, TRUE );
return 0;
case WM_SETFOCUS:
descr->in_focus = TRUE;

2
reactos/dll/win32/user32/controls/scrollbar.c
View file

@ -1357,7 +1357,7 @@ ScrollBarWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
Rect.bottom = Rect.top + ThumbSize;
}
HideCaret(Wnd);
InvalidateRect(Wnd, &Rect, FALSE);
NtUserInvalidateRect(Wnd, &Rect, FALSE);
DestroyCaret();
}
break;

2
reactos/dll/win32/user32/user32.def
View file

@ -407,7 +407,7 @@ InsertMenuItemW@16
InsertMenuW@20
InternalGetWindowText@12
IntersectRect@12
InvalidateRect@12
InvalidateRect@12=NtUserInvalidateRect@12
InvalidateRgn@12
InvertRect@8
IsCharAlphaA@4

12
reactos/dll/win32/user32/windows/paint.c
View file

@ -147,18 +147,6 @@ GetUpdateRgn(
}
/*
* @implemented
*/
BOOL
STDCALL
InvalidateRect(
HWND hWnd,
CONST RECT *lpRect,
BOOL bErase)
{
return NtUserInvalidateRect(hWnd, lpRect, bErase);
}
/*

0
reactos/tools/nci/sysfuncs.lst → reactos/ntoskrnl/sysfuncs.lst
View file

0
reactos/tools/nci/w32ksvc.db → reactos/subsystems/win32/win32k/w32ksvc.db
View file

6
reactos/tools/nci/nci.mak
View file

@ -42,13 +42,14 @@ nci_clean:
clean: nci_clean
# WIN32K.SYS
WIN32K_SVC_DB = $(NCI_BASE_)w32ksvc.db
WIN32K_SVC_DB = subsystems$(SEP)win32$(SEP)win32k$(SEP)w32ksvc.db
WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
WIN32K_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S
# NTOSKRNL.EXE
KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst
KERNEL_SVC_DB = ntoskrnl$(SEP)sysfuncs.lst
KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h
NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S
KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S
@ -67,6 +68,7 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB)
${mkdir} ntoskrnl$(SEP)ex$(SEP)$(ARCH) 2>$(NUL)
${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL)
${mkdir} lib$(SEP)win32ksys$(SEP)$(ARCH) 2>$(NUL)
$(Q)$(NCI_TARGET) -arch $(ARCH) \
$(KERNEL_SVC_DB) \
$(WIN32K_SVC_DB) \