diff --git a/reactos/dll/win32/user32/controls/button.c b/reactos/dll/win32/user32/controls/button.c index 0bfd70ad0d9..f00fd7af272 100644 --- a/reactos/dll/win32/user32/controls/button.c +++ b/reactos/dll/win32/user32/controls/button.c @@ -210,7 +210,7 @@ __inline static void paint_button( HWND hwnd, LONG style, UINT action ) { if (btnPaintFunc[style] && IsWindowVisible(hwnd)) { - HDC hdc = GetDC( hwnd ); + HDC hdc = NtUserGetDC( hwnd ); btnPaintFunc[style]( hwnd, hdc, action ); ReleaseDC( hwnd, hdc ); } @@ -317,11 +317,11 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, if (btnPaintFunc[btn_type]) { PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); + HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint( hWnd, &ps ); int nOldMode = SetBkMode( hdc, OPAQUE ); (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ - if( !wParam ) EndPaint( hWnd, &ps ); + if( !wParam ) NtUserEndPaint( hWnd, &ps ); } break; @@ -344,8 +344,8 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, } /* fall through */ case WM_LBUTTONDOWN: - SetCapture( hWnd ); - SetFocus( hWnd ); + NtUserSetCapture( hWnd ); + NtUserSetFocus( hWnd ); set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED ); SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 ); break; @@ -409,7 +409,7 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); + HDC hdc = NtUserGetDC(hWnd); HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); diff --git a/reactos/dll/win32/user32/controls/combo.c b/reactos/dll/win32/user32/controls/combo.c index 14e358a1371..152c053e4e1 100644 --- a/reactos/dll/win32/user32/controls/combo.c +++ b/reactos/dll/win32/user32/controls/combo.c @@ -198,7 +198,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) TRACE("[%p]: freeing storage\n", lphc->self); if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + NtUserDestroyWindow( lphc->hWndLBox ); SetWindowLongPtrW( lphc->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, lphc ); @@ -231,7 +231,7 @@ static INT CBGetTextAreaHeight( else { TEXTMETRICW tm; - HDC hDC = GetDC(hwnd); + HDC hDC = NtUserGetDC(hwnd); HFONT hPrevFont = 0; INT baseUnitY; @@ -331,7 +331,7 @@ static void CBForceDummyResize( * this will cancel-out in the processing of the WM_WINDOWPOSCHANGING * message. */ - SetWindowPos( lphc->self, + NtUserSetWindowPos( lphc->self, NULL, 0, 0, windowRect.right - windowRect.left, @@ -662,7 +662,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { /* Now do the trick with parent */ - SetParent(lphc->hWndLBox, HWND_DESKTOP); + NtUserSetParent(lphc->hWndLBox, HWND_DESKTOP); /* * If the combo is a dropdown, we must resize the control * to fit only the text area and button. To do this, @@ -929,7 +929,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) HDC hDC; hDC = (hParamDC) ? hParamDC - : BeginPaint( lphc->self, &ps); + : NtUserBeginPaint( lphc->self, &ps); TRACE("hdc=%p\n", hDC); @@ -975,7 +975,7 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) } if( !hParamDC ) - EndPaint(lphc->self, &ps); + NtUserEndPaint(lphc->self, &ps); return 0; } @@ -1141,19 +1141,19 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) rect.bottom = rect.top - nDroppedHeight; - SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, + NtUserSetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, lphc->droppedRect.right - lphc->droppedRect.left, nDroppedHeight, SWP_NOACTIVATE | SWP_SHOWWINDOW); if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + NtUserRedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | + RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self) - SetCapture(lphc->hWndLBox); + NtUserSetCapture(lphc->hWndLBox); } /*********************************************************************** @@ -1178,7 +1178,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton ) RECT rect; lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); + NtUserShowWindow( lphc->hWndLBox, SW_HIDE ); if(GetCapture() == lphc->hWndLBox) { @@ -1204,8 +1204,8 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton ) } if( bButton && !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + NtUserRedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | + RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); CB_NOTIFY( lphc, CBN_CLOSEUP ); } } @@ -1567,13 +1567,13 @@ static void CBResetPos( * sizing messages */ if( lphc->wState & CBF_EDIT ) - SetWindowPos( lphc->hWndEdit, 0, + NtUserSetWindowPos( lphc->hWndEdit, 0, rectEdit->left, rectEdit->top, rectEdit->right - rectEdit->left, rectEdit->bottom - rectEdit->top, SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) ); - SetWindowPos( lphc->hWndLBox, 0, + NtUserSetWindowPos( lphc->hWndLBox, 0, rectLB->left, rectLB->top, rectLB->right - rectLB->left, rectLB->bottom - rectLB->top, @@ -1584,12 +1584,12 @@ static void CBResetPos( if( lphc->wState & CBF_DROPPED ) { lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); + NtUserShowWindow( lphc->hWndLBox, SW_HIDE ); } if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); + NtUserRedrawWindow( lphc->self, NULL, 0, + RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); } } @@ -1741,7 +1741,7 @@ static void COMBO_LButtonDown( LPHEADCOMBO lphc, LPARAM lParam ) /* drop down the listbox and start tracking */ lphc->wState |= CBF_CAPTURE; - SetCapture( hWnd ); + NtUserSetCapture( hWnd ); CBDropDown( lphc ); } if( bButton ) CBRepaintButton( lphc ); @@ -1770,7 +1770,7 @@ static void COMBO_LButtonUp( LPHEADCOMBO lphc ) } } ReleaseCapture(); - SetCapture(lphc->hWndLBox); + NtUserSetCapture(lphc->hWndLBox); } if( lphc->wState & CBF_BUTTONDOWN ) @@ -1943,7 +1943,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, return (LRESULT)lphc->hFont; case WM_SETFOCUS: if( lphc->wState & CBF_EDIT ) - SetFocus( lphc->hWndEdit ); + NtUserSetFocus( lphc->hWndEdit ); else COMBO_SetFocus( lphc ); return TRUE; @@ -2054,7 +2054,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, SendMessageA(hwndTarget, message, wParam, lParam); } case WM_LBUTTONDOWN: - if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); + if( !(lphc->wState & CBF_FOCUSED) ) NtUserSetFocus( lphc->self ); if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); return TRUE; case WM_LBUTTONUP: diff --git a/reactos/dll/win32/user32/controls/edit.c b/reactos/dll/win32/user32/controls/edit.c index ec8c553e98d..3891dc55df5 100644 --- a/reactos/dll/win32/user32/controls/edit.c +++ b/reactos/dll/win32/user32/controls/edit.c @@ -1173,7 +1173,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (istart == iend && delta == 0) return; - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); @@ -1443,7 +1443,7 @@ static void EDIT_CalcLineWidth_SL(EDITSTATE *es) text = EDIT_GetPasswordPointer_SL(es); - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); @@ -1577,7 +1577,7 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) *after_wrap = FALSE; return line_index; } - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); low = line_index; @@ -1621,7 +1621,7 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) } text = EDIT_GetPasswordPointer_SL(es); - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); if (x < 0) @@ -3187,7 +3187,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) LINEDEF *line_def; index = min(index, len); - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); if (es->style & ES_MULTILINE) { @@ -3803,7 +3803,7 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, /* Set the default margins depending on the font */ if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) { - HDC dc = GetDC(es->hwndSelf); + HDC dc = NtUserGetDC(es->hwndSelf); HFONT old_font = SelectObject(dc, es->font); GetTextMetricsW(dc, &tm); /* The default margins are only non zero for TrueType or Vector fonts */ @@ -4257,7 +4257,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) /* copy */ EnableMenuItem(popup, 3, MF_BYPOSITION | ((end - start) && !(es->style & ES_PASSWORD) ? MF_ENABLED : MF_GRAYED)); /* paste */ - EnableMenuItem(popup, 4, MF_BYPOSITION | (IsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(popup, 4, MF_BYPOSITION | (NtUserIsClipboardFormatAvailable(CF_UNICODETEXT) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* delete */ EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* select all */ @@ -4274,7 +4274,7 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) } TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); - DestroyMenu(menu); + NtUserDestroyMenu(menu); } @@ -4301,9 +4301,9 @@ static void EDIT_WM_Copy(EDITSTATE *es) TRACE("%s\n", debugstr_w(dst)); GlobalUnlock(hdst); OpenClipboard(es->hwndSelf); - EmptyClipboard(); + NtUserEmptyClipboard(); SetClipboardData(CF_UNICODETEXT, hdst); - CloseClipboard(); + NtUserCloseClipboard(); } @@ -4801,7 +4801,7 @@ static LRESULT EDIT_WM_LButtonDblClk(EDITSTATE *es) INT ll; es->bCaptureState = TRUE; - SetCapture(es->hwndSelf); + NtUserSetCapture(es->hwndSelf); l = EDIT_EM_LineFromChar(es, e); li = EDIT_EM_LineIndex(es, l); @@ -4811,7 +4811,7 @@ static LRESULT EDIT_WM_LButtonDblClk(EDITSTATE *es) EDIT_EM_SetSel(es, s, e, FALSE); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); + NtUserSetTimer(es->hwndSelf, 0, 100, NULL); return 0; } @@ -4827,17 +4827,17 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) BOOL after_wrap; es->bCaptureState = TRUE; - SetCapture(es->hwndSelf); + NtUserSetCapture(es->hwndSelf); EDIT_ConfinePoint(es, &x, &y); e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; if (!(es->style & ES_MULTILINE)) - SetTimer(es->hwndSelf, 0, 100, NULL); + NtUserSetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) - SetFocus(es->hwndSelf); + NtUserSetFocus(es->hwndSelf); return 0; } @@ -4851,7 +4851,7 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - KillTimer(es->hwndSelf, 0); + NtUserKillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; @@ -5026,7 +5026,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) BOOL rev = es->bEnableState && ((es->flags & EF_FOCUSED) || (es->style & ES_NOHIDESEL)); - dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); + dc = hdc ? hdc : NtUserBeginPaint(es->hwndSelf, &ps); GetClientRect(es->hwndSelf, &rcClient); @@ -5091,7 +5091,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) SelectObject(dc, old_font); if (!hdc) - EndPaint(es->hwndSelf, &ps); + NtUserEndPaint(es->hwndSelf, &ps); } @@ -5120,7 +5120,7 @@ static void EDIT_WM_Paste(EDITSTATE *es) const WCHAR empty_strW[] = { 0 }; EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); } - CloseClipboard(); + NtUserCloseClipboard(); } @@ -5139,12 +5139,12 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) /* single line edit updates itself */ if (!(es->style & ES_MULTILINE)) { - HDC hdc = GetDC(es->hwndSelf); + HDC hdc = NtUserGetDC(es->hwndSelf); EDIT_WM_Paint(es, hdc); ReleaseDC(es->hwndSelf, hdc); } - CreateCaret(es->hwndSelf, 0, 2, es->line_height); + NtUserCreateCaret(es->hwndSelf, 0, 2, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); @@ -5169,7 +5169,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) RECT clientRect; es->font = font; - dc = GetDC(es->hwndSelf); + dc = NtUserGetDC(es->hwndSelf); if (font) old_font = SelectObject(dc, font); GetTextMetricsW(dc, &tm); @@ -5194,7 +5194,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) EDIT_UpdateText(es, NULL, TRUE); if (es->flags & EF_FOCUSED) { DestroyCaret(); - CreateCaret(es->hwndSelf, 0, 2, es->line_height); + NtUserCreateCaret(es->hwndSelf, 0, 2, es->line_height); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); ShowCaret(es->hwndSelf); @@ -5506,7 +5506,7 @@ static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase) es->flags &= ~EF_UPDATE; EDIT_NOTIFY_PARENT(es, EN_UPDATE); } - InvalidateRgn(es->hwndSelf, hrgn, bErase); + NtUserInvalidateRgn(es->hwndSelf, hrgn, bErase); } diff --git a/reactos/dll/win32/user32/controls/icontitle.c b/reactos/dll/win32/user32/controls/icontitle.c index bacb7e8499a..9d4ff52aea0 100644 --- a/reactos/dll/win32/user32/controls/icontitle.c +++ b/reactos/dll/win32/user32/controls/icontitle.c @@ -108,7 +108,7 @@ static BOOL ICONTITLE_SetTitlePos( HWND hwnd, HWND owner ) length = strlenW( str ); } - if (!(hDC = GetDC( hwnd ))) return FALSE; + if (!(hDC = NtUserGetDC( hwnd ))) return FALSE; hPrevFont = SelectObject( hDC, hIconTitleFont ); @@ -131,7 +131,7 @@ static BOOL ICONTITLE_SetTitlePos( HWND hwnd, HWND owner ) /* point is relative to owner, make it relative to parent */ MapWindowPoints( owner, GetParent(hwnd), &pt, 1 ); - SetWindowPos( hwnd, owner, pt.x, pt.y, cx, cy, SWP_NOACTIVATE ); + NtUserSetWindowPos( hwnd, owner, pt.x, pt.y, cx, cy, SWP_NOACTIVATE ); return TRUE; } @@ -224,7 +224,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, case WM_NCLBUTTONDBLCLK: return SendMessageW( owner, msg, wParam, lParam ); case WM_ACTIVATE: - if( wParam ) SetActiveWindow( owner ); + if( wParam ) NtUserSetActiveWindow( owner ); return 0; case WM_CLOSE: return 0; diff --git a/reactos/dll/win32/user32/controls/listbox.c b/reactos/dll/win32/user32/controls/listbox.c index 5d23959cad9..6286e4c707f 100644 --- a/reactos/dll/win32/user32/controls/listbox.c +++ b/reactos/dll/win32/user32/controls/listbox.c @@ -52,7 +52,6 @@ BOOL is_old_app(HWND hwnd) #define WS_EX_DRAGDETECT 0x00000002L #define WM_BEGINDRAG 0x022C -UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ @@ -460,9 +459,9 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) #endif TRACE("[%p]: changing height %d -> %d\n", descr->self, descr->height, descr->height - remaining ); - SetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, - rect.bottom - rect.top - remaining, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); + NtUserSetWindowPos( descr->self, 0, 0, 0, rect.right - rect.left, + rect.bottom - rect.top - remaining, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE ); return; } } @@ -736,7 +735,7 @@ static void LISTBOX_RepaintItem( LB_DESCR *descr, INT index, UINT action ) return; } if (LISTBOX_GetItemRect( descr, index, &rect ) != 1) return; - if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) return; if (descr->font) oldFont = SelectObject( hdc, descr->font ); hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, (WPARAM)hdc, (LPARAM)descr->self ); @@ -767,7 +766,7 @@ static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) if (!descr->caret_on || !descr->in_focus) return; if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) != 1) return; - if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) return; + if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) return; if (descr->font) oldFont = SelectObject( hdc, descr->font ); if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); @@ -1388,7 +1387,7 @@ static INT LISTBOX_SetFont( LB_DESCR *descr, HFONT font ) descr->font = font; - if (!(hdc = GetDCEx( descr->self, 0, DCX_CACHE ))) + if (!(hdc = NtUserGetDCEx( descr->self, 0, DCX_CACHE ))) { ERR("unable to get DC.\n" ); return 16; @@ -2131,8 +2130,8 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN if (!descr->in_focus) { - if( !descr->lphc ) SetFocus( descr->self ); - else SetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit : descr->lphc->self ); + if( !descr->lphc ) NtUserSetFocus( descr->self ); + else NtUserSetFocus( (descr->lphc->hWndEdit) ? descr->lphc->hWndEdit : descr->lphc->self ); } if (index == -1) return 0; @@ -2145,7 +2144,7 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN } descr->captured = TRUE; - SetCapture( descr->self ); + NtUserSetCapture( descr->self ); if (descr->style & (LBS_EXTENDEDSEL | LBS_MULTIPLESEL)) { @@ -2294,7 +2293,7 @@ static LRESULT LISTBOX_HandleLButtonDownCombo( LB_DESCR *descr, UINT msg, DWORD /* Resume the Capture after scrolling is complete */ if(hWndOldCapture != 0) - SetCapture(hWndOldCapture); + NtUserSetCapture(hWndOldCapture); } } return 0; @@ -2413,7 +2412,7 @@ static void LISTBOX_HandleMouseMove( LB_DESCR *descr, /* Start/stop the system timer */ if (dir != LB_TIMER_NONE) - SetSystemTimer( descr->self, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL); + NtUserSetSystemTimer( descr->self, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL); else if (LISTBOX_Timer != LB_TIMER_NONE) KillSystemTimer( descr->self, LB_TIMER_ID ); LISTBOX_Timer = dir; @@ -3270,9 +3269,9 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( descr->self, &ps ); + HDC hdc = ( wParam ) ? ((HDC)wParam) : NtUserBeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); - if( !wParam ) EndPaint( hwnd, &ps ); + if( !wParam ) NtUserEndPaint( hwnd, &ps ); } return ret; case WM_SIZE: @@ -3477,12 +3476,3 @@ static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARA return ListBoxWndProc_common( hwnd, msg, wParam, lParam, TRUE ); } -/*********************************************************************** - * GetListBoxInfo !REACTOS! - */ -DWORD WINAPI -GetListBoxInfo(HWND hwnd) -{ - return NtUserGetListBoxInfo(hwnd); // Do it right! Have the message org from kmode! -} - diff --git a/reactos/dll/win32/user32/controls/scrollbar.c b/reactos/dll/win32/user32/controls/scrollbar.c index a0b6a68731e..f3a50b19ae9 100644 --- a/reactos/dll/win32/user32/controls/scrollbar.c +++ b/reactos/dll/win32/user32/controls/scrollbar.c @@ -72,7 +72,6 @@ HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /********************************************************************* @@ -816,7 +815,7 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(Wnd); /* hide caret while holding down LBUTTON */ - SetCapture(Wnd); + NtUserSetCapture(Wnd); PrevPt = Pt; ScrollTrackHitTest = HitTest = SCROLL_THUMB; break; @@ -839,7 +838,7 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) return; } - Dc = GetDCEx(Wnd, 0, DCX_CACHE | ((SB_CTL == SBType) ? 0 : DCX_WINDOW)); + Dc = NtUserGetDCEx(Wnd, 0, DCX_CACHE | ((SB_CTL == SBType) ? 0 : DCX_WINDOW)); if (SB_VERT == SBType) { Vertical = TRUE; @@ -868,9 +867,9 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) PrevPt = Pt; if (SB_CTL == SBType && 0 != (GetWindowLongW(Wnd, GWL_STYLE) & WS_TABSTOP)) { - SetFocus(Wnd); + NtUserSetFocus(Wnd); } - SetCapture(Wnd); + NtUserSetCapture(Wnd); ScrollBarInfo.rgstate[ScrollTrackHitTest] |= STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); @@ -916,9 +915,9 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_LINEUP, (LPARAM) WndCtl); } - SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -934,9 +933,9 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_PAGEUP, (LPARAM) WndCtl); } - SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -1000,9 +999,9 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_PAGEDOWN, (LPARAM) WndCtl); } - SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -1018,9 +1017,9 @@ IntScrollHandleScrollEvent(HWND Wnd, INT SBType, UINT Msg, POINT Pt) SendMessageW(WndOwner, Vertical ? WM_VSCROLL : WM_HSCROLL, SB_LINEDOWN, (LPARAM) WndCtl); } - SetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC) NULL); + NtUserSetSystemTimer(Wnd, SCROLL_TIMER, (WM_LBUTTONDOWN == Msg) ? + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, + (TIMERPROC) NULL); } else { @@ -1094,45 +1093,45 @@ static void IntScrollCreateScrollBar( { if (0 != (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN)) { - MoveWindow(Wnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL) + 1, - GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, GetSystemMetrics(SM_CXVSCROLL) + 1, + GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } else if (0 != (lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN)) { - MoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, - lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, - GetSystemMetrics(SM_CXVSCROLL) + 1, - GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + NtUserMoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, + lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, + GetSystemMetrics(SM_CXVSCROLL) + 1, + GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } } else if (0 != (lpCreate->style & SBS_VERT)) { if (0 != (lpCreate->style & SBS_LEFTALIGN)) { - MoveWindow(Wnd, lpCreate->x, lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); + NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, + GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); } else if (0 != (lpCreate->style & SBS_RIGHTALIGN)) { - MoveWindow(Wnd, - lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, - lpCreate->y, - GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); + NtUserMoveWindow(Wnd, + lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, + lpCreate->y, + GetSystemMetrics(SM_CXVSCROLL) + 1, lpCreate->cy, FALSE); } } else /* SBS_HORZ */ { if (0 != (lpCreate->style & SBS_TOPALIGN)) { - MoveWindow(Wnd, lpCreate->x, lpCreate->y, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + NtUserMoveWindow(Wnd, lpCreate->x, lpCreate->y, + lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } else if (0 != (lpCreate->style & SBS_BOTTOMALIGN)) { - MoveWindow(Wnd, - lpCreate->x, - lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, - lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); + NtUserMoveWindow(Wnd, + lpCreate->x, + lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, + lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } } } @@ -1279,7 +1278,7 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA DbgPrint("ScrollBarWndProc WM_ENABLE\n"); NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ - hdc = GetDCEx( Wnd, 0, DCX_CACHE ); + hdc = NtUserGetDCEx( Wnd, 0, DCX_CACHE ); if (!hdc) return 1; IntDrawScrollBar( Wnd, hdc, SB_CTL); ReleaseDC( Wnd, hdc ); @@ -1328,12 +1327,12 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA &ArrowSize, &ThumbSize, &ThumbPos); if (! Vertical) { - CreateCaret(Wnd, (HBITMAP) 1, ThumbSize - 2, Rect.bottom - Rect.top - 2); + NtUserCreateCaret(Wnd, (HBITMAP) 1, ThumbSize - 2, Rect.bottom - Rect.top - 2); SetCaretPos(ThumbPos + 1, Rect.top + 1); } else { - CreateCaret(Wnd, (HBITMAP) 1, Rect.right - Rect.left - 2, ThumbSize - 2); + NtUserCreateCaret(Wnd, (HBITMAP) 1, Rect.right - Rect.left - 2, ThumbSize - 2); SetCaretPos(Rect.top + 1, ThumbPos + 1); } ShowCaret(Wnd); @@ -1374,7 +1373,7 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA PAINTSTRUCT Ps; HDC Dc; - Dc = (0 != wParam ? (HDC) wParam : BeginPaint(Wnd, &Ps)); + Dc = (0 != wParam ? (HDC) wParam : NtUserBeginPaint(Wnd, &Ps)); if (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEGRIP) { @@ -1393,7 +1392,7 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA if (0 == wParam) { - EndPaint(Wnd, &Ps); + NtUserEndPaint(Wnd, &Ps); } } break; @@ -1419,7 +1418,7 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA return IntScrollGetScrollRange(Wnd, SB_CTL, (LPINT) wParam, (LPINT) lParam); case SBM_ENABLE_ARROWS: - return EnableScrollBar(Wnd, SB_CTL, wParam); + return NtUserEnableScrollBar(Wnd, SB_CTL, wParam); case SBM_SETRANGEREDRAW: { @@ -1476,24 +1475,6 @@ ScrollBarWndProcA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) /* PUBLIC FUNCTIONS ***********************************************************/ -/* - * @implemented - */ -BOOL WINAPI -EnableScrollBar(HWND hWnd, UINT wSBflags, UINT wArrows) -{ - return NtUserEnableScrollBar(hWnd, wSBflags, wArrows); -} - -/* - * @implemented - */ -BOOL WINAPI -GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) -{ - return NtUserGetScrollBarInfo(hWnd, idObject, psbi); -} - /* * @implemented */ @@ -1610,12 +1591,3 @@ SetScrollRange(HWND hWnd, INT nBar, INT nMinPos, INT nMaxPos, BOOL bRedraw) return TRUE; } - -/* - * @implemented - */ -BOOL WINAPI -ShowScrollBar(HWND hWnd, INT wBar, BOOL bShow) -{ - return NtUserShowScrollBar(hWnd, wBar, bShow); -} diff --git a/reactos/dll/win32/user32/controls/static.c b/reactos/dll/win32/user32/controls/static.c index 5433d9be2ad..57611be927d 100644 --- a/reactos/dll/win32/user32/controls/static.c +++ b/reactos/dll/win32/user32/controls/static.c @@ -211,8 +211,8 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) } else */ { - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + NtUserSetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } return prevIcon; @@ -248,8 +248,8 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) } else */ { - SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + NtUserSetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } return hOldBitmap; @@ -384,7 +384,7 @@ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) HDC hdc; HRGN hOrigClipping; - hdc = GetDC( hwnd ); + hdc = NtUserGetDC( hwnd ); setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); restore_clipping(hdc, hOrigClipping); @@ -483,7 +483,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint(hwnd, &ps); if (staticPaintFunc[style]) { HRGN hOrigClipping; @@ -491,7 +491,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, (staticPaintFunc[style])( hwnd, hdc, full_style ); restore_clipping(hdc, hOrigClipping); } - if (!wParam) EndPaint(hwnd, &ps); + if (!wParam) NtUserEndPaint(hwnd, &ps); } break; @@ -581,7 +581,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + NtUserRedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; @@ -654,7 +654,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, if (STATIC_update_uistate(hwnd, unicode) && hasTextStyle( full_style )) { - RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + NtUserRedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c index 37d3e99bd56..e6851eef353 100644 --- a/reactos/dll/win32/user32/misc/dde.c +++ b/reactos/dll/win32/user32/misc/dde.c @@ -651,7 +651,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst) */ WDML_FreeAllHSZ(pInstance); - DestroyWindow(pInstance->hwndEvent); + NtUserDestroyWindow(pInstance->hwndEvent); /* OK now delete the instance handle itself */ @@ -1652,7 +1652,7 @@ void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) pPrev->next = pServer->next; } - DestroyWindow(pServer->hwndServer); + NtUserDestroyWindow(pServer->hwndServer); WDML_DecHSZ(pInstance, pServer->hszServiceSpec); WDML_DecHSZ(pInstance, pServer->hszService); @@ -1793,7 +1793,7 @@ void WDML_RemoveConv(WDML_CONV* pRef, WDML_SIDE side) hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer; SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0); - DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); + NtUserDestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); WDML_DecHSZ(pRef->instance, pRef->hszService); WDML_DecHSZ(pRef->instance, pRef->hszTopic); diff --git a/reactos/dll/win32/user32/misc/ddeserver.c b/reactos/dll/win32/user32/misc/ddeserver.c index 31db147cb45..a8d18dce86c 100644 --- a/reactos/dll/win32/user32/misc/ddeserver.c +++ b/reactos/dll/win32/user32/misc/ddeserver.c @@ -370,7 +370,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien } else { - DestroyWindow(hwndServerConv); + NtUserDestroyWindow(hwndServerConv); } return pConv; } diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c index 7b3e3236010..d479f50f891 100644 --- a/reactos/dll/win32/user32/misc/desktop.c +++ b/reactos/dll/win32/user32/misc/desktop.c @@ -327,7 +327,7 @@ SystemParametersInfoA(UINT uiAction, } } - RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); + NtUserRedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; } @@ -434,7 +434,7 @@ SystemParametersInfoW(UINT uiAction, } } - RedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); + NtUserRedrawWindow(GetShellWindow(), NULL, NULL, RDW_INVALIDATE | RDW_ERASE); return Ret; } @@ -443,18 +443,6 @@ SystemParametersInfoW(UINT uiAction, } -/* - * @implemented - */ -BOOL -WINAPI -CloseDesktop( - HDESK hDesktop) -{ - return NtUserCloseDesktop(hDesktop); -} - - /* * @implemented */ @@ -624,76 +612,13 @@ OpenDesktopW( } -/* - * @implemented - */ -HDESK -WINAPI -OpenInputDesktop( - DWORD dwFlags, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) -{ - return NtUserOpenInputDesktop( - dwFlags, - fInherit, - dwDesiredAccess); -} - - -/* - * @implemented - */ -BOOL -WINAPI -PaintDesktop( - HDC hdc) -{ - return NtUserPaintDesktop(hdc); -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetThreadDesktop( - HDESK hDesktop) -{ - return NtUserSetThreadDesktop(hDesktop); -} - - -/* - * @implemented - */ -BOOL -WINAPI -SwitchDesktop( - HDESK hDesktop) -{ - return NtUserSwitchDesktop(hDesktop); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetShellWindowEx(HWND hwndShell, HWND hwndShellListView) -{ - return NtUserSetShellWindowEx(hwndShell, hwndShellListView); -} - - /* * @implemented */ BOOL WINAPI SetShellWindow(HWND hwndShell) { - return SetShellWindowEx(hwndShell, hwndShell); + return NtUserSetShellWindowEx(hwndShell, hwndShell); } diff --git a/reactos/dll/win32/user32/misc/misc.c b/reactos/dll/win32/user32/misc/misc.c index 813593c4544..4b5c04e3066 100644 --- a/reactos/dll/win32/user32/misc/misc.c +++ b/reactos/dll/win32/user32/misc/misc.c @@ -35,19 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ -DWORD -WINAPI -GetGuiResources( - HANDLE hProcess, - DWORD uiFlags) -{ - return NtUserGetGuiResources(hProcess, uiFlags); -} - - /* * Private calls for CSRSS */ @@ -262,7 +249,7 @@ EndTask( if (IsWindow(hWnd)) { if (fForce) - return DestroyWindow(hWnd); + return NtUserDestroyWindow(hWnd); else return FALSE; } diff --git a/reactos/dll/win32/user32/misc/object.c b/reactos/dll/win32/user32/misc/object.c index 25ede78fad9..0b3bc5d734a 100644 --- a/reactos/dll/win32/user32/misc/object.c +++ b/reactos/dll/win32/user32/misc/object.c @@ -35,53 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ -/* - * @unimplemented - */ -BOOL -WINAPI -SetUserObjectInformationA( - HANDLE hObj, - int nIndex, - PVOID pvInfo, - DWORD nLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetUserObjectInformationW( - HANDLE hObj, - int nIndex, - PVOID pvInfo, - DWORD nLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -UserHandleGrantAccess( - HANDLE hUserHandle, - HANDLE hJob, - BOOL bGrant) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* * @implemented */ @@ -101,7 +54,7 @@ GetUserObjectInformationA( pvInfo, nLength, lpnLengthNeeded); if (nIndex != UOI_NAME && nIndex != UOI_TYPE) - return GetUserObjectInformationW(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); + return NtUserGetObjectInformation(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); /* allocate unicode buffer */ buffer = HeapAlloc(GetProcessHeap(), 0, nLength*2); @@ -112,7 +65,7 @@ GetUserObjectInformationA( } /* get unicode string */ - if (!GetUserObjectInformationW(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) + if (!NtUserGetObjectInformation(hObj, nIndex, buffer, nLength*2, lpnLengthNeeded)) ret = FALSE; *lpnLengthNeeded /= 2; @@ -130,22 +83,3 @@ GetUserObjectInformationA( HeapFree(GetProcessHeap(), 0, buffer); return ret; } - - -/* - * @implemented - */ -BOOL -WINAPI -GetUserObjectInformationW( - HANDLE hObj, - int nIndex, - PVOID pvInfo, - DWORD nLength, - LPDWORD lpnLengthNeeded) -{ - TRACE("GetUserObjectInformationW(%x %d %x %d %x)\n", hObj, nIndex, - pvInfo, nLength, lpnLengthNeeded); - return NtUserGetObjectInformation(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); -} - diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c index acd3ff950eb..d627f26935b 100644 --- a/reactos/dll/win32/user32/misc/stubs.c +++ b/reactos/dll/win32/user32/misc/stubs.c @@ -46,30 +46,6 @@ GetMouseMovePointsEx( } -/* - * @implemented - */ -BOOL -WINAPI -LockWindowUpdate( - HWND hWndLock) -{ - return NtUserLockWindowUpdate(hWndLock); -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -LockWorkStation(VOID) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* * @unimplemented */ @@ -137,7 +113,7 @@ GetInternalWindowPos( { WINDOWPLACEMENT wndpl; - if (GetWindowPlacement(hwnd, &wndpl)) + if (NtUserGetWindowPlacement(hwnd, &wndpl)) { if (rectWnd) *rectWnd = wndpl.rcNormalPosition; if (ptIcon) *ptIcon = wndpl.ptMinPosition; @@ -191,35 +167,6 @@ RegisterSystemThread ( DWORD flags, DWORD reserved ) UNIMPLEMENTED; } -/* - * @unimplemented - */ -DWORD -WINAPI -RegisterTasklist ( DWORD x ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -DWORD -WINAPI -DragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 - ) -{ - return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1); -} - - - /* * @implemented diff --git a/reactos/dll/win32/user32/misc/timer.c b/reactos/dll/win32/user32/misc/timer.c index 15392b9544c..cd26c44f8c3 100644 --- a/reactos/dll/win32/user32/misc/timer.c +++ b/reactos/dll/win32/user32/misc/timer.c @@ -45,50 +45,3 @@ KillSystemTimer( { return NtUserCallHwndParam(hWnd, IDEvent, HWNDPARAM_ROUTINE_KILLSYSTEMTIMER); } - - -/* - * @implemented - */ -BOOL -WINAPI -KillTimer( - HWND hWnd, - UINT_PTR IDEvent) -{ - return NtUserKillTimer(hWnd, IDEvent); -} - - -/* - * @implemented - */ -UINT_PTR -WINAPI -SetSystemTimer( - HWND hWnd, - UINT_PTR IDEvent, - UINT Period, - TIMERPROC TimerFunc) -{ - return NtUserSetSystemTimer(hWnd, IDEvent, Period, TimerFunc); -} - - -/* - * @implemented - */ -UINT_PTR -WINAPI -SetTimer( - HWND hWnd, - UINT_PTR IDEvent, - UINT Period, - TIMERPROC TimerFunc) -{ - return NtUserSetTimer(hWnd, IDEvent, Period, TimerFunc); -} - - - - diff --git a/reactos/dll/win32/user32/misc/winsta.c b/reactos/dll/win32/user32/misc/winsta.c index 6ffc5fe703f..d6c66a76f90 100644 --- a/reactos/dll/win32/user32/misc/winsta.c +++ b/reactos/dll/win32/user32/misc/winsta.c @@ -13,15 +13,6 @@ #include -/* - * @implemented - */ -BOOL WINAPI -CloseWindowStation(HWINSTA hWinSta) -{ - return(NtUserCloseWindowStation(hWinSta)); -} - /* * @implemented @@ -272,16 +263,6 @@ EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, } -/* - * @implemented - */ -HWINSTA WINAPI -GetProcessWindowStation(VOID) -{ - return NtUserGetProcessWindowStation(); -} - - /* * @implemented */ @@ -330,16 +311,6 @@ OpenWindowStationW(LPWSTR lpszWinSta, } -/* - * @implemented - */ -BOOL WINAPI -SetProcessWindowStation(HWINSTA hWinSta) -{ - return NtUserSetProcessWindowStation(hWinSta); -} - - /* * @unimplemented */ @@ -355,27 +326,5 @@ SetWindowStationUser( return NtUserSetWindowStationUser(Unknown1, Unknown2, Unknown3, Unknown4); } - -/* - * @implemented - */ -BOOL -WINAPI -LockWindowStation(HWINSTA hWinSta) -{ - return NtUserLockWindowStation(hWinSta); -} - - -/* - * @implemented - */ -BOOL -WINAPI -UnlockWindowStation(HWINSTA hWinSta) -{ - return NtUserUnlockWindowStation(hWinSta); -} - /* EOF */ diff --git a/reactos/dll/win32/user32/user32.def b/reactos/dll/win32/user32/user32.def index fb31dbff918..bee005da02f 100644 --- a/reactos/dll/win32/user32/user32.def +++ b/reactos/dll/win32/user32/user32.def @@ -14,8 +14,8 @@ AppendMenuW@16 ArrangeIconicWindows@4 AttachThreadInput@12=NtUserAttachThreadInput@12 BeginDeferWindowPos@4 -BeginPaint@8 -BlockInput@4 +BeginPaint@8=NtUserBeginPaint@8 +BlockInput@4=NtUserBlockInput@4 BringWindowToTop@4 BroadcastSystemMessage=BroadcastSystemMessageA@20 BroadcastSystemMessageA@20 @@ -32,7 +32,7 @@ CallWindowProcA@20 CallWindowProcW@20 CascadeChildWindows@8 CascadeWindows@20 -ChangeClipboardChain@8 +ChangeClipboardChain@8=NtUserChangeClipboardChain@8 ChangeDisplaySettingsA@8 ChangeDisplaySettingsExA@20 ChangeDisplaySettingsExW@20 @@ -66,21 +66,21 @@ ChildWindowFromPointEx@16 ;CliImmSetHotKey ClientThreadSetup@0 ClientToScreen@8 -ClipCursor@4 -CloseClipboard@0 -CloseDesktop@4 +ClipCursor@4=NtUserClipCursor@4 +CloseClipboard@0=NtUserCloseClipboard@0 +CloseDesktop@4=NtUserCloseDesktop@4 CloseWindow@4 -CloseWindowStation@4 +CloseWindowStation@4=NtUserCloseWindowStation@4 CopyAcceleratorTableA@12 -CopyAcceleratorTableW@12 +CopyAcceleratorTableW@12=NtUserCopyAcceleratorTable@12 CopyCursor@4 CopyIcon@4 CopyImage@20 CopyRect@8 -CountClipboardFormats@0 +CountClipboardFormats@0=NtUserCountClipboardFormats@0 CreateAcceleratorTableA@8 -CreateAcceleratorTableW@8 -CreateCaret@16 +CreateAcceleratorTableW@8=NtUserCreateAcceleratorTable@8 +CreateCaret@16=NtUserCreateCaret@16 CreateCursor@28 CreateDesktopA@24 CreateDesktopW@24 @@ -147,15 +147,15 @@ DefRawInputProc@12 DefWindowProcA@16 DefWindowProcW@16 DeferWindowPos@32 -DeleteMenu@12 +DeleteMenu@12=NtUserDeleteMenu@12 DeregisterShellHookWindow@4 DestroyAcceleratorTable@4 DestroyCaret@0 DestroyCursor@4 DestroyIcon@4 -DestroyMenu@4 +DestroyMenu@4=NtUserDestroyMenu@4 ;DestroyReasons -DestroyWindow@4 +DestroyWindow@4=NtUserDestroyWindow@4 ;DeviceEventWorker DialogBoxIndirectParamA@20 DialogBoxIndirectParamAorW@24 @@ -175,8 +175,8 @@ DlgDirSelectComboBoxExW@16 DlgDirSelectExA@16 DlgDirSelectExW@16 DragDetect@12 -DragObject@20 -DrawAnimatedRects@16 +DragObject@20=NtUserDragObject@20 +DrawAnimatedRects@16=NtUserDrawAnimatedRects@16 DrawCaption@16 DrawCaptionTempA@28 DrawCaptionTempW@28 @@ -195,14 +195,14 @@ DrawTextExA@24 DrawTextExW@24 DrawTextW@20 EditWndProc=EditWndProcA@16 -EmptyClipboard@0 +EmptyClipboard@0=NtUserEmptyClipboard@0 EnableMenuItem@12 -EnableScrollBar@12 +EnableScrollBar@12=NtUserEnableScrollBar@12 EnableWindow@8 EndDeferWindowPos@4 EndDialog@8 EndMenu@0 -EndPaint@8 +EndPaint@8=NtUserEndPaint@8 EndTask@12 EnterReaderModeHelper@4 EnumChildWindows@12 @@ -226,7 +226,7 @@ EnumWindowStationsA@8 EnumWindowStationsW@8 EnumWindows@8 EqualRect@8 -ExcludeUpdateRgn@8 +ExcludeUpdateRgn@8=NtUserExcludeUpdateRgn@8 ExitWindowsEx@8 FillRect@12 FindWindowA@8 @@ -234,7 +234,7 @@ FindWindowExA@16 FindWindowExW@16 FindWindowW@8 FlashWindow@8 -FlashWindowEx@4 +FlashWindowEx@4=NtUserFlashWindowEx@4 FrameRect@12 FreeDDElParam@8 ;FullScreenControl @@ -248,8 +248,8 @@ GetAppCompatFlags@4 GetAppCompatFlags2@4 GetAsyncKeyState@4 GetCapture@0 -GetCaretBlinkTime@0 -GetCaretPos@4 +GetCaretBlinkTime@0=NtUserGetCaretBlinkTime@0 +GetCaretPos@4=NtUserGetCaretPos@4 GetClassInfoA@12 GetClassInfoExA@12 GetClassInfoExW@12 @@ -260,20 +260,20 @@ GetClassNameA@12 GetClassNameW@12 GetClassWord@8 GetClientRect@8 -GetClipCursor@4 +GetClipCursor@4=NtUserGetClipCursor@4 GetClipboardData@4 GetClipboardFormatNameA@12 GetClipboardFormatNameW@12 -GetClipboardOwner@0 -GetClipboardSequenceNumber@0 -GetClipboardViewer@0 +GetClipboardOwner@0=NtUserGetClipboardOwner@0 +GetClipboardSequenceNumber@0=NtUserGetClipboardSequenceNumber@0 +GetClipboardViewer@0=NtUserGetClipboardViewer@0 GetComboBoxInfo@8 GetCursor@0 ;GetCursorFrameInfo -GetCursorInfo@4 +GetCursorInfo@4=NtUserGetCursorInfo@4 GetCursorPos@4 -GetDC@4 -GetDCEx@12 +GetDC@4=NtUserGetDC@4 +GetDCEx@12=NtUserGetDCEx@12 GetDesktopWindow@0 GetDialogBaseUnits@0 GetDlgCtrlID@4 @@ -281,11 +281,11 @@ GetDlgItem@8 GetDlgItemInt@16 GetDlgItemTextA@16 GetDlgItemTextW@16 -GetDoubleClickTime@0 +GetDoubleClickTime@0=NtUserGetDoubleClickTime@0 GetFocus@0 -GetForegroundWindow@0 -GetGUIThreadInfo@8 -GetGuiResources@8 +GetForegroundWindow@0=NtUserGetForegroundWindow@0 +GetGUIThreadInfo@8=NtUserGetGUIThreadInfo@8 +GetGuiResources@8=NtUserGetGuiResources@8 GetIconInfo@8 GetInputDesktop@0 GetInputState@0 @@ -298,14 +298,14 @@ GetKeyboardLayout@4 GetKeyboardLayoutList@8=NtUserGetKeyboardLayoutList@8 GetKeyboardLayoutNameA@4 GetKeyboardLayoutNameW@4 -GetKeyboardState@4 +GetKeyboardState@4=NtUserGetKeyboardState@4 GetKeyboardType@4 GetLastActivePopup@4 GetLastInputInfo@4 GetLayeredWindowAttributes@16=NtUserGetLayeredWindowAttributes@16 -GetListBoxInfo@4 +GetListBoxInfo@4=NtUserGetListBoxInfo@4 GetMenu@4 -GetMenuBarInfo@16 +GetMenuBarInfo@16=NtUserGetMenuBarInfo@16 GetMenuCheckMarkDimensions@0 GetMenuContextHelpId@4 GetMenuDefaultItem@12 @@ -314,7 +314,7 @@ GetMenuItemCount@4 GetMenuItemID@8 GetMenuItemInfoA@16 GetMenuItemInfoW@16 -GetMenuItemRect@16 +GetMenuItemRect@16=NtUserGetMenuItemRect@16 GetMenuState@12 GetMenuStringA@20 GetMenuStringW@20 @@ -328,11 +328,11 @@ GetMonitorInfoW@8 GetMouseMovePointsEx@20 GetNextDlgGroupItem@12 GetNextDlgTabItem@12 -GetOpenClipboardWindow@0 +GetOpenClipboardWindow@0=NtUserGetOpenClipboardWindow@0 GetParent@4 -GetPriorityClipboardFormat@8 +GetPriorityClipboardFormat@8=NtUserGetPriorityClipboardFormat@8 GetProcessDefaultLayout@4 -GetProcessWindowStation@0 +GetProcessWindowStation@0=NtUserGetProcessWindowStation@0 GetProgmanWindow@0 GetPropA@8 GetPropW@8 @@ -344,7 +344,7 @@ GetRawInputDeviceInfoW@16 GetRawInputDeviceList@12 ;GetReasonTitleFromReasonCode GetRegisteredRawInputDevices@12 -GetScrollBarInfo@12 +GetScrollBarInfo@12=NtUserGetScrollBarInfo@12 GetScrollInfo@12 GetScrollPos@8 GetScrollRange@16 @@ -358,24 +358,24 @@ GetTabbedTextExtentA@20 GetTabbedTextExtentW@20 GetTaskmanWindow@0 GetThreadDesktop@4 -GetTitleBarInfo@8 +GetTitleBarInfo@8=NtUserGetTitleBarInfo@8 GetTopWindow@4 GetUpdateRect@12 GetUpdateRgn@12 GetUserObjectInformationA@20 -GetUserObjectInformationW@20 +GetUserObjectInformationW@20=NtUserGetObjectInformation@20 GetUserObjectSecurity@20 ;GetWinStationInfo GetWindow@8 GetWindowContextHelpId@4 -GetWindowDC@4 +GetWindowDC@4=NtUserGetWindowDC@4 GetWindowInfo@8 GetWindowLongA@8 GetWindowLongW@8 GetWindowModuleFileName=GetWindowModuleFileNameA@12 GetWindowModuleFileNameA@12 GetWindowModuleFileNameW@12 -GetWindowPlacement@8 +GetWindowPlacement@8=NtUserGetWindowPlacement@8 GetWindowRect@8 GetWindowRgn@8 GetWindowRgnBox@8 @@ -388,7 +388,7 @@ GetWindowWord@8 GrayStringA@36 GrayStringW@36 HideCaret@4=NtUserHideCaret@4 -HiliteMenuItem@16 +HiliteMenuItem@16=NtUserHiliteMenuItem@16 IMPGetIMEA@8 IMPGetIMEW@8 IMPQueryIMEA@4 @@ -408,7 +408,7 @@ InsertMenuW@20 InternalGetWindowText@12 IntersectRect@12 InvalidateRect@12=NtUserInvalidateRect@12 -InvalidateRgn@12 +InvalidateRgn@12=NtUserInvalidateRgn@12 InvertRect@8 IsCharAlphaA@4 IsCharAlphaNumericA@4 @@ -419,7 +419,7 @@ IsCharLowerW@4 IsCharUpperA@4 IsCharUpperW@4 IsChild@8 -IsClipboardFormatAvailable@4 +IsClipboardFormatAvailable@4=NtUserIsClipboardFormatAvailable@4 IsDialogMessage=IsDialogMessageA@8 IsDialogMessageA@8 IsDialogMessageW@8 @@ -438,7 +438,7 @@ IsWindowVisible@4 IsWinEventHookInstalled@4 IsZoomed@4 KillSystemTimer@8 -KillTimer@8 +KillTimer@8=NtUserKillTimer@8 LoadAcceleratorsA@8 LoadAcceleratorsW@8 LoadBitmapA@8 @@ -463,9 +463,9 @@ LoadRemoteFonts@0 LoadStringA@16 LoadStringW@16 LockSetForegroundWindow@4 -LockWindowStation@4 -LockWindowUpdate@4 -LockWorkStation@0 +LockWindowStation@4=NtUserLockWindowStation@4 +LockWindowUpdate@4=NtUserLockWindowUpdate@4 +LockWorkStation@0=NtUserLockWorkStation@0 LookupIconIdFromDirectory@8 LookupIconIdFromDirectoryEx@20 MBToWCSEx@24 @@ -493,7 +493,7 @@ ModifyMenuW@20 MonitorFromPoint@12 MonitorFromRect@8 MonitorFromWindow@8 -MoveWindow@24 +MoveWindow@24=NtUserMoveWindow@24 MsgWaitForMultipleObjects@20 MsgWaitForMultipleObjectsEx@20 NotifyWinEvent@16 @@ -507,11 +507,11 @@ OpenClipboard@4 OpenDesktopA@16 OpenDesktopW@16 OpenIcon@4 -OpenInputDesktop@12 +OpenInputDesktop@12=NtUserOpenInputDesktop@12 OpenWindowStationA@12 OpenWindowStationW@12 PackDDElParam@12 -PaintDesktop@4 +PaintDesktop@4=NtUserPaintDesktop@4 ;PaintMenuBar PeekMessageA@20 PeekMessageW@20 @@ -540,7 +540,7 @@ RealGetWindowClassW@12 ReasonCodeNeedsBugID@4 ReasonCodeNeedsComment@4 ;RecordShutdownReason -RedrawWindow@16 +RedrawWindow@16=NtUserRedrawWindow@16 RegisterClassA@4 RegisterClassExA@4 RegisterClassExW@4 @@ -549,7 +549,7 @@ RegisterClipboardFormatA@4 RegisterClipboardFormatW@4 RegisterDeviceNotificationA@12=RegisterDeviceNotificationW@12 RegisterDeviceNotificationW@12 -RegisterHotKey@16 +RegisterHotKey@16=NtUserRegisterHotKey@16 RegisterLogonProcess@8 RegisterMessagePumpHook@4 RegisterRawInputDevices@12 @@ -557,12 +557,12 @@ RegisterServicesProcess@4 RegisterShellHookWindow@4 RegisterSystemThread@8 RegisterUserApiHook@8 -RegisterTasklist@4 +RegisterTasklist@4=NtUserRegisterTasklist@4 RegisterWindowMessageA@4 RegisterWindowMessageW@4 ReleaseCapture@0 ReleaseDC@8 -RemoveMenu@12 +RemoveMenu@12=NtUserRemoveMenu@12 RemovePropA@8 RemovePropW@8 ReplyMessage@4 @@ -577,7 +577,7 @@ SendDlgItemMessageA@20 SendDlgItemMessageW@20 SendIMEMessageExA@8 SendIMEMessageExW@8 -SendInput@12 +SendInput@12=NtUserSendInput@12 SendMessageA@16 SendMessageCallbackA@24 SendMessageCallbackW@24 @@ -586,17 +586,17 @@ SendMessageTimeoutW@28 SendMessageW@16 SendNotifyMessageA@16 SendNotifyMessageW@16 -SetActiveWindow@4 -SetCapture@4 +SetActiveWindow@4=NtUserSetActiveWindow@4 +SetCapture@4=NtUserSetCapture@4 SetCaretBlinkTime@4 SetCaretPos@8 SetClassLongA@12 SetClassLongW@12 SetClassWord@12 SetClipboardData@8 -SetClipboardViewer@4 +SetClipboardViewer@4=NtUserSetClipboardViewer@4 ;SetConsoleReserveKeys -SetCursor@4 +SetCursor@4=NtUserSetCursor@4 ;SetCursorContents SetCursorPos@8 SetDebugErrorLevel@4 @@ -605,25 +605,25 @@ SetDlgItemInt@16 SetDlgItemTextA@12 SetDlgItemTextW@12 SetDoubleClickTime@4 -SetFocus@4 +SetFocus@4=NtUserSetFocus@4 SetForegroundWindow@4 SetInternalWindowPos@16 -SetKeyboardState@4 +SetKeyboardState@4=NtUserSetKeyboardState@4 SetLastErrorEx@8 SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16 SetLogonNotifyWindow@8 SetMenu@8 -SetMenuContextHelpId@8 -SetMenuDefaultItem@12 +SetMenuContextHelpId@8=NtUserSetMenuContextHelpId@8 +SetMenuDefaultItem@12=NtUserSetMenuDefaultItem@12 SetMenuInfo@8 SetMenuItemBitmaps@20 SetMenuItemInfoA@16 SetMenuItemInfoW@16 SetMessageExtraInfo@4 SetMessageQueue@4 -SetParent@8 +SetParent@8=NtUserSetParent@8 SetProcessDefaultLayout@4 -SetProcessWindowStation@4 +SetProcessWindowStation@4=NtUserSetProcessWindowStation@4 SetProgmanWindow@4 SetPropA@12 SetPropW@12 @@ -633,24 +633,24 @@ SetScrollInfo@16 SetScrollPos@16 SetScrollRange@20 SetShellWindow@4 -SetShellWindowEx@8 +SetShellWindowEx@8=NtUserSetShellWindowEx@8 SetSysColors@12 SetSysColorsTemp@12 SetSystemCursor@8 SetSystemMenu@8 -SetSystemTimer@16 +SetSystemTimer@16=NtUserSetSystemTimer@16 SetTaskmanWindow@4 -SetThreadDesktop@4 -SetTimer@16 -SetUserObjectInformationA@16 -SetUserObjectInformationW@16 +SetThreadDesktop@4=NtUserSetThreadDesktop@4 +SetTimer@16=NtUserSetTimer@16 +SetUserObjectInformationA@16=NtUserSetObjectInformation@16 +SetUserObjectInformationW@16=NtUserSetObjectInformation@16 SetUserObjectSecurity@12 SetWinEventHook@28 SetWindowContextHelpId@8 SetWindowLongA@12 SetWindowLongW@12 -SetWindowPlacement@8 -SetWindowPos@28 +SetWindowPlacement@8=NtUserSetWindowPlacement@8 +SetWindowPos@28=NtUserSetWindowPos@28 SetWindowRgn@12 SetWindowStationUser@16 SetWindowTextA@8 @@ -663,14 +663,14 @@ SetWindowsHookW@8 ShowCaret@4=NtUserShowCaret@4 ShowCursor@4 ShowOwnedPopups@8 -ShowScrollBar@12 +ShowScrollBar@12=NtUserShowScrollBar@12 ShowStartGlass@4 -ShowWindow@8 -ShowWindowAsync@8 +ShowWindow@8=NtUserShowWindow@8 +ShowWindowAsync@8=NtUserShowWindowAsync@8 SoftModalMessageBox@4 SubtractRect@12 SwapMouseButton@4 -SwitchDesktop@4 +SwitchDesktop@4=NtUserSwitchDesktop@4 SwitchToThisWindow@8 SystemParametersInfoA@16 SystemParametersInfoW@16 @@ -696,7 +696,7 @@ UnhookWindowsHook@8 UnhookWindowsHookEx@4=NtUserUnhookWindowsHookEx@4 UnionRect@12 UnloadKeyboardLayout@4=NtUserUnloadKeyboardLayout@4 -UnlockWindowStation@4 +UnlockWindowStation@4=NtUserUnlockWindowStation@4 UnpackDDElParam@16 UnregisterClassA@8 UnregisterClassW@8 @@ -710,7 +710,7 @@ UpdatePerUserSystemParameters@8 UpdateWindow@4 User32InitializeImmEntryTable@4 UserClientDllInitialize=DllMain@12 -UserHandleGrantAccess@12 +UserHandleGrantAccess@12=NtUserUserHandleGrantAccess@12 ;UserLpkPSMTextOut ;UserLpkTabbedTextOut UserRealizePalette@4 @@ -728,7 +728,7 @@ WINNLSEnableIME@8 WINNLSGetEnableStatus@4 WINNLSGetIMEHotkey@4 WaitForInputIdle@8 -WaitMessage@0 +WaitMessage@0=NtUserWaitMessage@0 ;Win32PoolAllocationStats WinHelpA@16 WinHelpW@16 diff --git a/reactos/dll/win32/user32/windows/accel.c b/reactos/dll/win32/user32/windows/accel.c index 3baf4f5a7d9..031d5886987 100644 --- a/reactos/dll/win32/user32/windows/accel.c +++ b/reactos/dll/win32/user32/windows/accel.c @@ -267,29 +267,6 @@ int WINAPI TranslateAcceleratorW(HWND hWnd, HACCEL hAccTable, LPMSG lpMsg) return NtUserTranslateAccelerator(hWnd, hAccTable, lpMsg); } -/* - * @implemented - */ -int WINAPI CopyAcceleratorTableW -( - HACCEL hAccelSrc, - LPACCEL lpAccelDst, - int cAccelEntries -) -{ - return NtUserCopyAcceleratorTable(hAccelSrc, lpAccelDst, cAccelEntries); -} - -/* - * @implemented - */ -HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccl, int cEntries) -{ - if (!cEntries || !lpaccl) return (HACCEL)0; - - return NtUserCreateAcceleratorTable(lpaccl, cEntries); -} - /* * @implemented @@ -303,7 +280,7 @@ int WINAPI CopyAcceleratorTableA { int i; - cAccelEntries = CopyAcceleratorTableW(hAccelSrc, lpAccelDst, cAccelEntries); + cAccelEntries = NtUserCopyAcceleratorTable(hAccelSrc, lpAccelDst, cAccelEntries); if (lpAccelDst == NULL) return cAccelEntries; @@ -349,7 +326,7 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccl, int cEntries) if(!NT_SUCCESS(nErrCode)) lpaccl[i].key = -1; } - return CreateAcceleratorTableW(lpaccl, cEntries); + return NtUserCreateAcceleratorTable(lpaccl, cEntries); } diff --git a/reactos/dll/win32/user32/windows/bitmap.c b/reactos/dll/win32/user32/windows/bitmap.c index 6ac37cb3f45..30540eb3c75 100644 --- a/reactos/dll/win32/user32/windows/bitmap.c +++ b/reactos/dll/win32/user32/windows/bitmap.c @@ -699,7 +699,7 @@ CopyBmp(HANDLE hnd, } else { - HDC screenDC = GetDC(NULL); + HDC screenDC = NtUserGetDC(NULL); res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); ReleaseDC(NULL, screenDC); } @@ -717,7 +717,7 @@ CopyBmp(HANDLE hnd, } else { - HDC screenDC = GetDC(NULL); + HDC screenDC = NtUserGetDC(NULL); int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); ReleaseDC(NULL, screenDC); diff --git a/reactos/dll/win32/user32/windows/caret.c b/reactos/dll/win32/user32/windows/caret.c index ce3214e1d6e..b82439bb007 100644 --- a/reactos/dll/win32/user32/windows/caret.c +++ b/reactos/dll/win32/user32/windows/caret.c @@ -39,7 +39,7 @@ DrawCaret(HWND hWnd, { HDC hDC, hComp; - hDC = GetDC(hWnd); + hDC = NtUserGetDC(hWnd); if(hDC) { if(CaretInfo->Bitmap && GetBitmapDimensionEx(CaretInfo->Bitmap, &CaretInfo->Size)) @@ -80,19 +80,6 @@ DrawCaret(HWND hWnd, } } -/* - * @implemented - */ -BOOL -WINAPI -CreateCaret(HWND hWnd, - HBITMAP hBitmap, - int nWidth, - int nHeight) -{ - return (BOOL)NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight); -} - /* * @implemented @@ -105,28 +92,6 @@ DestroyCaret(VOID) } -/* - * @implemented - */ -UINT -WINAPI -GetCaretBlinkTime(VOID) -{ - return NtUserGetCaretBlinkTime(); -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetCaretPos(LPPOINT lpPoint) -{ - return (BOOL)NtUserGetCaretPos(lpPoint); -} - - /* * @implemented */ diff --git a/reactos/dll/win32/user32/windows/clipboard.c b/reactos/dll/win32/user32/windows/clipboard.c index a39b4db7b00..2dad84d2f6f 100644 --- a/reactos/dll/win32/user32/windows/clipboard.c +++ b/reactos/dll/win32/user32/windows/clipboard.c @@ -34,39 +34,6 @@ OpenClipboard(HWND hWndNewOwner) return ret; } -/* - * @implemented - */ -BOOL -WINAPI -CloseClipboard(VOID) -{ - BOOL ret; - ret = NtUserCloseClipboard(); - return ret; -} - -/* - * @implemented - */ -INT -WINAPI -CountClipboardFormats(VOID) -{ - INT ret = NtUserCountClipboardFormats(); - return ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -EmptyClipboard(VOID) -{ - return NtUserEmptyClipboard(); -} - /* * @implemented */ @@ -173,68 +140,6 @@ GetClipboardFormatNameW(UINT format, } -/* - * @implemented - */ -HWND -WINAPI -GetClipboardOwner(VOID) -{ - return NtUserGetClipboardOwner(); -} - -/* - * @implemented - */ -DWORD -WINAPI -GetClipboardSequenceNumber(VOID) -{ - return NtUserGetClipboardSequenceNumber(); -} - -/* - * @implemented - */ -HWND -WINAPI -GetClipboardViewer(VOID) -{ - return NtUserGetClipboardViewer(); -} - -/* - * @implemented - */ -HWND -WINAPI -GetOpenClipboardWindow(VOID) -{ - return NtUserGetOpenClipboardWindow(); -} - -/* - * @implemented - */ -INT -WINAPI -GetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats) -{ - INT ret = NtUserGetPriorityClipboardFormat(paFormatPriorityList, cFormats); - return ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -IsClipboardFormatAvailable(UINT format) -{ - BOOL ret = NtUserIsClipboardFormatAvailable(format); - return ret; -} - /* * @implemented */ @@ -377,27 +282,6 @@ SetClipboardData(UINT uFormat, HANDLE hMem) } -/* - * @implemented - */ -HWND -WINAPI -SetClipboardViewer(HWND hWndNewViewer) -{ - return NtUserSetClipboardViewer(hWndNewViewer); -} - -/* - * @implemented - */ -BOOL -WINAPI -ChangeClipboardChain(HWND hWndRemove, - HWND hWndNewNext) -{ - return NtUserChangeClipboardChain(hWndRemove, hWndNewNext); -} - /* * @unimplemented */ diff --git a/reactos/dll/win32/user32/windows/cursor.c b/reactos/dll/win32/user32/windows/cursor.c index 5c5b23b56a0..c392b2e7cd6 100644 --- a/reactos/dll/win32/user32/windows/cursor.c +++ b/reactos/dll/win32/user32/windows/cursor.c @@ -53,13 +53,13 @@ User32SetupDefaultCursors(PVOID Arguments, if(*DefaultCursor) { /* set default cursor */ - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + NtUserSetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } else { /* FIXME load system cursor scheme */ - SetCursor(0); - SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); + NtUserSetCursor(0); + NtUserSetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); @@ -164,17 +164,6 @@ DestroyCursor(HCURSOR hCursor) } -/* - * @implemented - */ -BOOL -WINAPI -GetClipCursor(LPRECT lpRect) -{ - return NtUserGetClipCursor(lpRect); -} - - /* * @implemented */ @@ -191,17 +180,6 @@ GetCursor(VOID) } -/* - * @implemented - */ -BOOL -WINAPI -GetCursorInfo(PCURSORINFO pci) -{ - return (BOOL)NtUserGetCursorInfo(pci); -} - - /* * @implemented */ @@ -294,28 +272,6 @@ LoadCursorW(HINSTANCE hInstance, } -/* - * @implemented - */ -BOOL -WINAPI -ClipCursor(CONST RECT *lpRect) -{ - return NtUserClipCursor((RECT *)lpRect); -} - - -/* - * @implemented - */ -HCURSOR -WINAPI -SetCursor(HCURSOR hCursor) -{ - return NtUserSetCursor(hCursor); -} - - /* * @implemented */ diff --git a/reactos/dll/win32/user32/windows/dc.c b/reactos/dll/win32/user32/windows/dc.c index a5336f5cd6e..874b428a57b 100644 --- a/reactos/dll/win32/user32/windows/dc.c +++ b/reactos/dll/win32/user32/windows/dc.c @@ -34,40 +34,6 @@ /* FUNCTIONS *****************************************************************/ -/* - * @implemented - */ -HDC -WINAPI -GetDC(HWND hWnd) -{ - return NtUserGetDC(hWnd); -} - - -/* - * @implemented - */ -HDC -WINAPI -GetDCEx(HWND hWnd, - HRGN hrgnClip, - DWORD flags) -{ - return NtUserGetDCEx(hWnd, hrgnClip, flags); -} - - -/* - * @implemented - */ -HDC -WINAPI -GetWindowDC(HWND hWnd) -{ - return (HDC)NtUserGetWindowDC(hWnd); -} - BOOL WINAPI diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c index a86806767fd..14508e2088c 100644 --- a/reactos/dll/win32/user32/windows/defwnd.c +++ b/reactos/dll/win32/user32/windows/defwnd.c @@ -191,7 +191,7 @@ DefWndSetRedraw(HWND hWnd, WPARAM wParam) { if (Style & WS_VISIBLE) /* Visible */ { - RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); + NtUserRedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); Style &= ~WS_VISIBLE; SetWindowLong(hWnd, GWL_STYLE, Style); /* clear bits */ } @@ -227,7 +227,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) HICON hCursor = (HICON)GetClassLongW(hWnd, GCL_HCURSOR); if (hCursor) { - SetCursor(hCursor); + NtUserSetCursor(hCursor); return(TRUE); } return(FALSE); @@ -240,7 +240,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) { break; } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZEWE))); + return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZEWE))); } case HTTOP: @@ -250,7 +250,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) { break; } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENS))); + return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENS))); } case HTTOPLEFT: @@ -260,7 +260,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) { break; } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENWSE))); + return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENWSE))); } case HTBOTTOMLEFT: @@ -270,10 +270,10 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) { break; } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW))); + return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_SIZENESW))); } } - return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW))); + return((LRESULT)NtUserSetCursor(LoadCursorW(0, IDC_ARROW))); } static LONG @@ -469,7 +469,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) } else { - SetCapture(hwnd); + NtUserSetCapture(hwnd); hittest = DefWndStartSizeMove(hwnd, Wnd, wParam, &capturePoint); if (!hittest) { @@ -506,7 +506,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) } unmodRect = sizingRect; } - ClipCursor(&clipRect); + NtUserClipCursor(&clipRect); origRect = sizingRect; if (ON_LEFT_BORDER(hittest)) @@ -536,17 +536,17 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); - if (GetCapture() != hwnd) SetCapture( hwnd ); + if (GetCapture() != hwnd) NtUserSetCapture( hwnd ); if (Style & WS_CHILD) { /* Retrieve a default cache DC (without using the window style) */ - hdc = GetDCEx(hWndParent, 0, DCX_CACHE); + hdc = NtUserGetDCEx(hWndParent, 0, DCX_CACHE); DesktopRgn = NULL; } else { - hdc = GetDC( 0 ); + hdc = NtUserGetDC( 0 ); DesktopRgn = CreateRectRgnIndirect(&clipRect); } @@ -615,7 +615,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) if( iconic ) /* ok, no system popup tracking */ { - hOldCursor = SetCursor(hDragCursor); + hOldCursor = NtUserSetCursor(hDragCursor); ShowCursor( TRUE ); } } @@ -647,7 +647,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) else { /* To avoid any deadlocks, all the locks on the windows structures must be suspended before the SetWindowPos */ - SetWindowPos( hwnd, 0, newRect.left, newRect.top, + NtUserSetWindowPos( hwnd, 0, newRect.left, newRect.top, newRect.right - newRect.left, newRect.bottom - newRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); @@ -659,13 +659,13 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) } ReleaseCapture(); - ClipCursor(NULL); + NtUserClipCursor(NULL); if( iconic ) { if( moved ) /* restore cursors, show icon title later on */ { ShowCursor( FALSE ); - SetCursor( hOldCursor ); + NtUserSetCursor( hOldCursor ); } DestroyCursor( hDragCursor ); } @@ -703,14 +703,14 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ if(!DragFullWindows) - SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, + NtUserSetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); } else { /* restore previous size/position */ if(DragFullWindows) - SetWindowPos( hwnd, 0, origRect.left, origRect.top, + NtUserSetWindowPos( hwnd, 0, origRect.left, origRect.top, origRect.right - origRect.left, origRect.bottom - origRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); @@ -783,26 +783,26 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) break; case SC_MINIMIZE: wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) + if(NtUserGetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MINIMIZE; - SetWindowPlacement(hWnd, &wp); + NtUserSetWindowPlacement(hWnd, &wp); } break; case SC_MAXIMIZE: wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) + if(NtUserGetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MAXIMIZE; - SetWindowPlacement(hWnd, &wp); + NtUserSetWindowPlacement(hWnd, &wp); } break; case SC_RESTORE: wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) + if(NtUserGetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_RESTORE; - SetWindowPlacement(hWnd, &wp); + NtUserSetWindowPlacement(hWnd, &wp); } break; case SC_CLOSE: @@ -1003,9 +1003,9 @@ DefWndScreenshot(HWND hWnd) HDC hdc2; OpenClipboard(hWnd); - EmptyClipboard(); + NtUserEmptyClipboard(); - hdc = GetWindowDC(hWnd); + hdc = NtUserGetWindowDC(hWnd); GetWindowRect(hWnd, &rect); w = rect.right - rect.left; h = rect.bottom - rect.top; @@ -1023,7 +1023,7 @@ DefWndScreenshot(HWND hWnd) ReleaseDC(hWnd, hdc); ReleaseDC(hWnd, hdc2); - CloseClipboard(); + NtUserCloseClipboard(); } @@ -1107,7 +1107,7 @@ User32DefWindowProc(HWND hWnd, /* in Windows, capture is taken when right-clicking on the caption bar */ if (wParam == HTCAPTION) { - SetCapture(hWnd); + NtUserSetCapture(hWnd); } break; } @@ -1206,7 +1206,7 @@ User32DefWindowProc(HWND hWnd, case WM_PAINT: { PAINTSTRUCT Ps; - HDC hDC = BeginPaint(hWnd, &Ps); + HDC hDC = NtUserBeginPaint(hWnd, &Ps); if (hDC) { HICON hIcon; @@ -1223,7 +1223,7 @@ User32DefWindowProc(HWND hWnd, GetSystemMetrics(SM_CYICON)) / 2; DrawIcon(hDC, x, y, hIcon); } - EndPaint(hWnd, &Ps); + NtUserEndPaint(hWnd, &Ps); } return (0); } @@ -1234,7 +1234,7 @@ User32DefWindowProc(HWND hWnd, hRgn = CreateRectRgn(0, 0, 0, 0); if (GetUpdateRgn(hWnd, hRgn, FALSE) != NULLREGION) { - RedrawWindow(hWnd, NULL, hRgn, + NtUserRedrawWindow(hWnd, NULL, hRgn, RDW_ERASENOW | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); } @@ -1250,7 +1250,7 @@ User32DefWindowProc(HWND hWnd, case WM_CLOSE: { - DestroyWindow(hWnd); + NtUserDestroyWindow(hWnd); return (0); } @@ -1283,7 +1283,7 @@ User32DefWindowProc(HWND hWnd, if (LOWORD(wParam) != WA_INACTIVE && !(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) { - SetFocus(hWnd); + NtUserSetFocus(hWnd); } break; } @@ -1520,7 +1520,7 @@ User32DefWindowProc(HWND hWnd, INT Index = (wParam != 0) ? GCL_HICON : GCL_HICONSM; HICON hOldIcon = (HICON)GetClassLongW(hWnd, Index); SetClassLongW(hWnd, Index, lParam); - SetWindowPos(hWnd, 0, 0, 0, 0, 0, + NtUserSetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); return ((LRESULT)hOldIcon); diff --git a/reactos/dll/win32/user32/windows/dialog.c b/reactos/dll/win32/user32/windows/dialog.c index 2932d4f95df..00d9d9c44ae 100644 --- a/reactos/dll/win32/user32/windows/dialog.c +++ b/reactos/dll/win32/user32/windows/dialog.c @@ -536,7 +536,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (bFirstEmpty) { /* ShowWindow the first time the queue goes empty */ - ShowWindow( hwnd, SW_SHOWNORMAL ); + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); bFirstEmpty = FALSE; } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) @@ -558,7 +558,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); retval = dlgInfo->idResult; - DestroyWindow( hwnd ); + NtUserDestroyWindow( hwnd ); return retval; } @@ -703,7 +703,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, * for both +ve and -ve template.pointSize */ HDC dc; int pixels; - dc = GetDC(0); + dc = NtUserGetDC(0); pixels = MulDiv(template.pointSize, GetDeviceCaps(dc , LOGPIXELSY), 72); hUserFont = CreateFontW( -pixels, 0, 0, 0, template.weight, template.italic, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, @@ -824,7 +824,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (!hwnd) { if (hUserFont) DeleteObject( hUserFont ); - if (hMenu) DestroyMenu( hMenu ); + if (hMenu) NtUserDestroyMenu( hMenu ); if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } @@ -837,7 +837,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (dlgInfo == NULL) { if (hUserFont) DeleteObject( hUserFont ); - if (hMenu) DestroyMenu( hMenu ); + if (hMenu) NtUserDestroyMenu( hMenu ); if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); return 0; } @@ -872,7 +872,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, /* By returning TRUE, app has requested a default focus assignment */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); + NtUserSetFocus( dlgInfo->hwndFocus ); } } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) @@ -880,12 +880,12 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { - ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ + NtUserShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ } return hwnd; } if (modal && ownerEnabled) DIALOG_EnableOwner(owner); - if( IsWindow(hwnd) ) DestroyWindow( hwnd ); + if( IsWindow(hwnd) ) NtUserDestroyWindow( hwnd ); return 0; } @@ -906,7 +906,7 @@ static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) } if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); - SetFocus( hwndCtrl ); + NtUserSetFocus( hwndCtrl ); } /*********************************************************************** @@ -940,7 +940,7 @@ static void DEFDLG_RestoreFocus( HWND hwnd ) infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - SetFocus( infoPtr->hwndFocus ); + NtUserSetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -1078,7 +1078,7 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, GlobalFree16(dlgInfo->hDialogHeap); }*/ if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); - if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); + if (dlgInfo->hMenu) NtUserDestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); } /* Window clean-up */ @@ -1912,13 +1912,13 @@ EndDialog( /* Windows sets the focus to the dialog itself in EndDialog */ if (IsChild(hDlg, GetFocus())) - SetFocus( hDlg ); + NtUserSetFocus( hDlg ); /* Don't have to send a ShowWindow(SW_HIDE), just do SetWindowPos with SWP_HIDEWINDOW as done in Windows */ - SetWindowPos(hDlg, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE - | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW); + NtUserSetWindowPos(hDlg, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE + | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW); if (hDlg == GetActiveWindow()) WinPosActivateOtherWindow( hDlg ); @@ -1942,7 +1942,7 @@ GetDialogBaseUnits(VOID) HDC hdc; SIZE size; - if ((hdc = GetDC(0))) + if ((hdc = NtUserGetDC(0))) { size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); if (size.cx) units = MAKELONG( size.cx, size.cy ); @@ -2338,7 +2338,7 @@ IsDialogMessageW( SendMessageW (hwndNext, EM_SETSEL, 0, length); } } - SetFocus (hwndNext); + NtUserSetFocus (hwndNext); DIALOG_FixChildrenOnChangeFocus (hDlg, hwndNext); } else diff --git a/reactos/dll/win32/user32/windows/draw.c b/reactos/dll/win32/user32/windows/draw.c index c793ff9c0f6..4de2f0be931 100644 --- a/reactos/dll/win32/user32/windows/draw.c +++ b/reactos/dll/win32/user32/windows/draw.c @@ -1806,16 +1806,6 @@ FlashWindow(HWND hWnd, BOOL bInvert) return FALSE; } -/* - * @unimplemented - */ -BOOL WINAPI -FlashWindowEx(PFLASHWINFO pfwi) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @implemented */ @@ -1838,17 +1828,6 @@ FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) return TRUE; } -/* - * @unimplemented - */ -BOOL WINAPI -DrawAnimatedRects(HWND hWnd, int idAni, CONST RECT *lprcFrom, - CONST RECT *lprcTo) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @implemented */ diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c index 94fd02dd761..1b3b202b145 100644 --- a/reactos/dll/win32/user32/windows/input.c +++ b/reactos/dll/win32/user32/windows/input.c @@ -63,7 +63,7 @@ DragDetect( rect.top = pt.y - dy; rect.bottom = pt.y + dy; - SetCapture(hWnd); + NtUserSetCapture(hWnd); for (;;) { @@ -96,23 +96,13 @@ DragDetect( } } } - WaitMessage(); + NtUserWaitMessage(); } return 0; #endif } -/* - * @implemented - */ -BOOL WINAPI -BlockInput(BOOL fBlockIt) -{ - return NtUserBlockInput(fBlockIt); -} - - /* * @implemented */ @@ -135,7 +125,7 @@ EnableWindow(HWND hWnd, /* Remove keyboard focus from that window if it had focus */ if (hWnd == GetFocus()) { - SetFocus(NULL); + NtUserSetFocus(NULL); } } NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); @@ -159,17 +149,6 @@ GetAsyncKeyState(int vKey) } -/* - * @implemented - */ -UINT -WINAPI -GetDoubleClickTime(VOID) -{ - return NtUserGetDoubleClickTime(); -} - - /* * @implemented */ @@ -264,17 +243,6 @@ GetKeyboardLayoutNameW(LPWSTR pwszKLID) } -/* - * @implemented - */ -BOOL WINAPI -GetKeyboardState(PBYTE lpKeyState) -{ - - return (BOOL) NtUserGetKeyboardState((LPBYTE) lpKeyState); -} - - /* * @implemented */ @@ -391,22 +359,6 @@ OemKeyScan(WORD wOemChar) } -/* - * @implemented - */ -BOOL WINAPI -RegisterHotKey(HWND hWnd, - int id, - UINT fsModifiers, - UINT vk) -{ - return (BOOL)NtUserRegisterHotKey(hWnd, - id, - fsModifiers, - vk); -} - - /* * @implemented */ @@ -420,26 +372,6 @@ SetDoubleClickTime(UINT uInterval) } -/* - * @implemented - */ -HWND WINAPI -SetFocus(HWND hWnd) -{ - return NtUserSetFocus(hWnd); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetKeyboardState(LPBYTE lpKeyState) -{ - return (BOOL) NtUserSetKeyboardState((LPBYTE)lpKeyState); -} - - /* * @implemented */ @@ -574,20 +506,6 @@ VkKeyScanW(WCHAR ch) } -/* - * @implemented - */ -UINT -WINAPI -SendInput( - UINT nInputs, - LPINPUT pInputs, - int cbSize) -{ - return NtUserSendInput(nInputs, pInputs, cbSize); -} - - /* * @implemented */ @@ -762,7 +680,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR id /* stop the timer if the tracking list is empty */ if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - KillTimer(0, ptracking_info->timer); + NtUserKillTimer(0, ptracking_info->timer); RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); } } @@ -852,7 +770,7 @@ TrackMouseEvent( /* if we aren't tracking on hover or leave remove this entry */ if (!(ptracking_info->tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - KillTimer(0, ptracking_info->timer); + NtUserKillTimer(0, ptracking_info->timer); RtlZeroMemory(ptracking_info,sizeof(USER32_TRACKINGLIST)); } } @@ -868,7 +786,7 @@ TrackMouseEvent( if (!ptracking_info->timer) { - ptracking_info->timer = SetTimer(0, 0, hover_time, TrackMouseEventProc); + ptracking_info->timer = NtUserSetTimer(0, 0, hover_time, TrackMouseEventProc); } } } diff --git a/reactos/dll/win32/user32/windows/mdi.c b/reactos/dll/win32/user32/windows/mdi.c index 41f6ae9fc19..8ce24e9bb04 100644 --- a/reactos/dll/win32/user32/windows/mdi.c +++ b/reactos/dll/win32/user32/windows/mdi.c @@ -447,7 +447,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) if (mii.wID == ci->idFirstChild) { TRACE("removing %u items including separator\n", count - i); - while (RemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION)) + while (NtUserRemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION)) /* nothing */; break; @@ -545,16 +545,16 @@ static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo, BOOL activate { /* restore old MDI child */ SendMessageW( hwndPrev, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( hwndPrev, SW_RESTORE ); + NtUserShowWindow( hwndPrev, SW_RESTORE ); SendMessageW( hwndPrev, WM_SETREDRAW, TRUE, 0 ); /* activate new MDI child */ - SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); + NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); /* maximize new MDI child */ - ShowWindow( hwndTo, SW_MAXIMIZE ); + NtUserShowWindow( hwndTo, SW_MAXIMIZE ); } /* activate new MDI child */ - SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) ); + NtUserSetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) ); } } @@ -576,7 +576,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci, MDI_SwitchActiveChild(ci, next, TRUE); else { - ShowWindow(child, SW_HIDE); + NtUserShowWindow(child, SW_HIDE); if (IsZoomed(child)) { MDI_RestoreFrameMenu(GetParent(client), child, ci->hBmpClose); @@ -618,7 +618,7 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci, if (flagDestroy) { MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1); - DestroyWindow(child); + NtUserDestroyWindow(child); } TRACE("child destroyed - %p\n", child); @@ -663,7 +663,7 @@ static LONG MDI_ChildActivate( HWND client, HWND child ) if( isActiveFrameWnd ) { SendMessageW( child, WM_NCACTIVATE, TRUE, 0L); - SetFocus( client ); + NtUserSetFocus( client ); } SendMessageW( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child ); @@ -750,8 +750,8 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); - SetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + NtUserSetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, + SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); } } HeapFree( GetProcessHeap(), 0, win_array ); @@ -831,8 +831,8 @@ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam ) y = 0; for (r = 1; r <= rows && *pWnd; r++, i++) { - SetWindowPos(*pWnd, 0, x, y, xsize, ysize, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + NtUserSetWindowPos(*pWnd, 0, x, y, xsize, ysize, + SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); y += ysize; pWnd++; } @@ -891,7 +891,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) HDC hMemDC; HBITMAP hBitmap, hOldBitmap; HBRUSH hBrush; - HDC hdc = GetDC(hChild); + HDC hdc = NtUserGetDC(hChild); if (hdc) { @@ -916,14 +916,14 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) (UINT_PTR)hSysPopup, (LPSTR)hSysMenuBitmap)) { TRACE("not inserted\n"); - DestroyMenu(hSysPopup); + NtUserDestroyMenu(hSysPopup); return 0; } EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED); - SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); + NtUserSetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); /* redraw menu */ DrawMenuBar(frame); @@ -962,7 +962,7 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild, HBITMAP hBmpClose ) TRUE, &menuInfo); - RemoveMenu(menu,0,MF_BYPOSITION); + NtUserRemoveMenu(menu,0,MF_BYPOSITION); if ( (menuInfo.fType & MFT_BITMAP) && (menuInfo.dwTypeData != 0) && @@ -975,11 +975,11 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild, HBITMAP hBmpClose ) DeleteObject(menuInfo.hbmpItem); /* close */ - DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); /* restore */ - DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); + NtUserDeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); /* minimize */ - DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); + NtUserDeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); DrawMenuBar(frame); @@ -1205,7 +1205,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, return 0; case WM_MDIMAXIMIZE: - ShowWindow( (HWND)wParam, SW_MAXIMIZE ); + NtUserShowWindow( (HWND)wParam, SW_MAXIMIZE ); return 0; case WM_MDINEXT: /* lParam != 0 means previous window */ @@ -1231,7 +1231,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, case WM_MDITILE: ci->mdiFlags |= MDIF_NEEDUPDATE; - ShowScrollBar( hwnd, SB_BOTH, FALSE ); + NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); MDITile( hwnd, ci, wParam ); ci->mdiFlags &= ~MDIF_NEEDUPDATE; return 0; @@ -1245,7 +1245,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, case WM_SETFOCUS: if (ci->hwndActiveChild && !IsIconic( ci->hwndActiveChild )) - SetFocus( ci->hwndActiveChild ); + NtUserSetFocus( ci->hwndActiveChild ); return 0; case WM_NCACTIVATE: @@ -1284,7 +1284,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y); if( child && child != hwnd && child != ci->hwndActiveChild ) - SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); + NtUserSetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); break; } } @@ -1303,7 +1303,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); - MoveWindow(ci->hwndActiveChild, rect.left, rect.top, + NtUserMoveWindow(ci->hwndActiveChild, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1); } else @@ -1438,11 +1438,11 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, return 1; /* success. FIXME: check text length */ case WM_SETFOCUS: - SetFocus(hwndMDIClient); + NtUserSetFocus(hwndMDIClient); break; case WM_SIZE: - MoveWindow(hwndMDIClient, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); + NtUserMoveWindow(hwndMDIClient, 0, 0, LOWORD(lParam), HIWORD(lParam), TRUE); break; case WM_NEXTMENU: @@ -1771,7 +1771,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) if (style & WS_MAXIMIZE) { HeapFree( GetProcessHeap(), 0, list ); - ShowScrollBar( hwnd, SB_BOTH, FALSE ); + NtUserShowScrollBar( hwnd, SB_BOTH, FALSE ); return; } if (style & WS_VISIBLE) diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c index 261fc454ec2..bf29b158dde 100644 --- a/reactos/dll/win32/user32/windows/menu.c +++ b/reactos/dll/win32/user32/windows/menu.c @@ -957,9 +957,9 @@ PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_PAINT: { PAINTSTRUCT ps; - BeginPaint(Wnd, &ps); + NtUserBeginPaint(Wnd, &ps); MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrW(Wnd, 0)); - EndPaint(Wnd, &ps); + NtUserEndPaint(Wnd, &ps); return 0; } @@ -1044,7 +1044,7 @@ static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu) return NULL; if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) { - DestroyMenu(mii.hSubMenu); + NtUserDestroyMenu(mii.hSubMenu); return NULL; } mii.fMask |= MIIM_SUBMENU; @@ -1388,7 +1388,7 @@ MenuPopupMenuCalcSize(PROSMENUINFO MenuInfo, HWND WndOwner) return; } - Dc = GetDC(NULL); + Dc = NtUserGetDC(NULL); SelectObject(Dc, hMenuFont); Start = 0; @@ -1766,8 +1766,8 @@ MenuInitTracking(HWND Wnd, HMENU Menu, BOOL Popup, UINT Flags) { /* app changed/recreated menu bar entries in WM_INITMENU Recalculate menu sizes else clicks will not work */ - SetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); + NtUserSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } /* This makes the menus of applications built with Delphi work. @@ -1878,8 +1878,8 @@ MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id, } /* Display the window */ - SetWindowPos(MenuInfo.Wnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + NtUserSetWindowPos(MenuInfo.Wnd, HWND_TOPMOST, 0, 0, 0, 0, + SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); UpdateWindow(MenuInfo.Wnd); return TRUE; @@ -1963,11 +1963,11 @@ MenuSelectItem(HWND WndOwner, PROSMENUINFO MenuInfo, UINT Index, if (0 != (MenuInfo->Flags & MF_POPUP)) { - Dc = GetDC(MenuInfo->Wnd); + Dc = NtUserGetDC(MenuInfo->Wnd); } else { - Dc = GetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); + Dc = NtUserGetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); } if (NULL == TopPopup) @@ -2160,7 +2160,7 @@ MenuInitSysMenuPopup(HMENU Menu, DWORD Style, DWORD ClsStyle, LONG HitTest ) DefItem = SC_CLOSE; } #endif - SetMenuDefaultItem(Menu, DefItem, MF_BYCOMMAND); + NtUserSetMenuDefaultItem(Menu, DefItem, MF_BYCOMMAND); } /*********************************************************************** @@ -2220,11 +2220,11 @@ MenuShowSubPopup(HWND WndOwner, PROSMENUINFO MenuInfo, BOOL SelectFirst, UINT Fl { if (0 != (MenuInfo->Flags & MF_POPUP)) { - Dc = GetDC(MenuInfo->Wnd); + Dc = NtUserGetDC(MenuInfo->Wnd); } else { - Dc = GetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); + Dc = NtUserGetDCEx(MenuInfo->Wnd, 0, DCX_CACHE | DCX_WINDOW); } SelectObject(Dc, hMenuFont); @@ -2320,7 +2320,7 @@ MenuHideSubPopups(HWND WndOwner, PROSMENUINFO MenuInfo, BOOL SendMenuSelect) { MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE); MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL); - DestroyWindow(SubMenuInfo.Wnd); + NtUserDestroyWindow(SubMenuInfo.Wnd); SubMenuInfo.Wnd = NULL; MenuSetRosMenuInfo(&SubMenuInfo); } @@ -2880,7 +2880,7 @@ MenuDoNextMenu(MTRACKER* Mt, UINT Vk) if (NewWnd != Mt->OwnerWnd) { Mt->OwnerWnd = NewWnd; - SetCapture(Mt->OwnerWnd); + NtUserSetCapture(Mt->OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); } @@ -3243,7 +3243,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y, fEndMenu = ! fRemove; } - SetCapture(Mt.OwnerWnd); + NtUserSetCapture(Mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); while (! fEndMenu) @@ -3271,7 +3271,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y, EnterIdleSent = TRUE; SendMessageW(Mt.OwnerWnd, WM_ENTERIDLE, MSGF_MENU, (LPARAM) Win); } - WaitMessage(); + NtUserWaitMessage(); } } @@ -3529,7 +3529,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y, } (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); - SetCapture(NULL); /* release the capture */ + NtUserSetCapture(NULL); /* release the capture */ /* If dropdown is still painted and the close box is clicked on then the menu will be destroyed as part of the DispatchMessage above. @@ -3545,7 +3545,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y, if (0 != (MenuInfo.Flags & MF_POPUP)) { - DestroyWindow(MenuInfo.Wnd); + NtUserDestroyWindow(MenuInfo.Wnd); MenuInfo.Wnd = NULL; } MenuSelectItem(Mt.OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, FALSE, NULL); @@ -4027,28 +4027,6 @@ CreatePopupMenu(VOID) } -/* - * @implemented - */ -BOOL WINAPI -DeleteMenu(HMENU hMenu, - UINT uPosition, - UINT uFlags) -{ - return NtUserDeleteMenu(hMenu, uPosition, uFlags); -} - - -/* - * @implemented - */ -BOOL WINAPI -DestroyMenu(HMENU hMenu) -{ - return NtUserDestroyMenu(hMenu); -} - - /* * @implemented */ @@ -4078,7 +4056,7 @@ EndMenu(VOID) { GUITHREADINFO guii; guii.cbSize = sizeof(GUITHREADINFO); - if(GetGUIThreadInfo(GetCurrentThreadId(), &guii) && guii.hwndMenuOwner) + if(NtUserGetGUIThreadInfo(GetCurrentThreadId(), &guii) && guii.hwndMenuOwner) { PostMessageW(guii.hwndMenuOwner, WM_CANCELMODE, 0, 0); } @@ -4096,19 +4074,6 @@ GetMenu(HWND hWnd) } -/* - * @implemented - */ -BOOL WINAPI -GetMenuBarInfo(HWND hwnd, - LONG idObject, - LONG idItem, - PMENUBARINFO pmbi) -{ - return (BOOL)NtUserGetMenuBarInfo(hwnd, idObject, idItem, pmbi); -} - - /* * @implemented */ @@ -4349,19 +4314,6 @@ GetMenuItemInfoW( } -/* - * @implemented - */ -BOOL WINAPI -GetMenuItemRect(HWND hWnd, - HMENU hMenu, - UINT uItem, - LPRECT lprcItem) -{ - return NtUserGetMenuItemRect( hWnd, hMenu, uItem, lprcItem); -} - - /* * @implemented */ @@ -4498,22 +4450,6 @@ GetSystemMenu( } -/* - * @implemented - */ -BOOL -WINAPI -HiliteMenuItem( - HWND hwnd, - HMENU hmenu, - UINT uItemHilite, - UINT uHilite) -{ - return NtUserHiliteMenuItem(hwnd, hmenu, uItemHilite, uHilite); -} - - - /* * @implemented */ @@ -4724,7 +4660,7 @@ LoadMenuIndirectW(CONST MENUTEMPLATE *lpMenuTemplate) if (!(hMenu = CreateMenu())) return 0; if (!MENU_ParseResource(p, hMenu, TRUE)) { - DestroyMenu(hMenu); + NtUserDestroyMenu(hMenu); return 0; } return hMenu; @@ -4734,7 +4670,7 @@ LoadMenuIndirectW(CONST MENUTEMPLATE *lpMenuTemplate) if (!(hMenu = CreateMenu())) return 0; if (!MENUEX_ParseResource(p, hMenu)) { - DestroyMenu( hMenu ); + NtUserDestroyMenu( hMenu ); return 0; } return hMenu; @@ -4871,20 +4807,6 @@ ModifyMenuW( } -/* - * @implemented - */ -BOOL -WINAPI -RemoveMenu( - HMENU hMenu, - UINT uPosition, - UINT uFlags) -{ - return NtUserRemoveMenu(hMenu, uPosition, uFlags); -} - - /* * @implemented */ @@ -4896,20 +4818,6 @@ SetMenu(HWND hWnd, } -/* - * @implemented - */ -BOOL -WINAPI -SetMenuDefaultItem( - HMENU hMenu, - UINT uItem, - UINT fByPos) -{ - return NtUserSetMenuDefaultItem(hMenu, uItem, fByPos); -} - - /* * @implemented */ @@ -5160,18 +5068,6 @@ NEWTrackPopupMenu( } -/* - * @implemented - */ -BOOL -WINAPI -SetMenuContextHelpId(HMENU hmenu, - DWORD dwContextHelpId) -{ - return NtUserSetMenuContextHelpId(hmenu, dwContextHelpId); -} - - /* * @implemented */ @@ -5246,14 +5142,14 @@ ChangeMenuW( return AppendMenuW(hMenu, flags &~ MF_APPEND, cmdInsert, lpszNewItem); case MF_DELETE : - return DeleteMenu(hMenu, cmd, flags &~ MF_DELETE); + return NtUserDeleteMenu(hMenu, cmd, flags &~ MF_DELETE); case MF_CHANGE : return ModifyMenuW(hMenu, cmd, flags &~ MF_CHANGE, cmdInsert, lpszNewItem); case MF_REMOVE : - return RemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, - flags &~ MF_REMOVE); + return NtUserRemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, + flags &~ MF_REMOVE); default : /* MF_INSERT */ return InsertMenuW(hMenu, cmd, flags, cmdInsert, lpszNewItem); @@ -5284,14 +5180,14 @@ ChangeMenuA( return AppendMenuA(hMenu, flags &~ MF_APPEND, cmdInsert, lpszNewItem); case MF_DELETE : - return DeleteMenu(hMenu, cmd, flags &~ MF_DELETE); + return NtUserDeleteMenu(hMenu, cmd, flags &~ MF_DELETE); case MF_CHANGE : return ModifyMenuA(hMenu, cmd, flags &~ MF_CHANGE, cmdInsert, lpszNewItem); case MF_REMOVE : - return RemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, - flags &~ MF_REMOVE); + return NtUserRemoveMenu(hMenu, flags & MF_BYPOSITION ? cmd : cmdInsert, + flags &~ MF_REMOVE); default : /* MF_INSERT */ return InsertMenuA(hMenu, cmd, flags, cmdInsert, lpszNewItem); diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c index 1f7f3a1ae5f..2594148b2b4 100644 --- a/reactos/dll/win32/user32/windows/message.c +++ b/reactos/dll/win32/user32/windows/message.c @@ -2114,17 +2114,6 @@ TranslateMessage(CONST MSG *lpMsg) } -/* - * @implemented - */ -BOOL -WINAPI -WaitMessage(VOID) -{ - return NtUserWaitMessage(); -} - - /* * @implemented */ @@ -2158,15 +2147,6 @@ RegisterWindowMessageW(LPCWSTR lpString) return(NtUserRegisterWindowMessage(&String)); } -/* - * @implemented - */ -HWND WINAPI -SetCapture(HWND hWnd) -{ - return(NtUserSetCapture(hWnd)); -} - /* * @implemented */ diff --git a/reactos/dll/win32/user32/windows/messagebox.c b/reactos/dll/win32/user32/windows/messagebox.c index 598eabea96b..04658dcca47 100644 --- a/reactos/dll/win32/user32/windows/messagebox.c +++ b/reactos/dll/win32/user32/windows/messagebox.c @@ -104,12 +104,12 @@ static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, { case MB_ABORTRETRYIGNORE: case MB_YESNO: - RemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); + NtUserRemoveMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND); break; } - SetFocus(GetDlgItem(hwnd, mbi->DefBtn)); + NtUserSetFocus(GetDlgItem(hwnd, mbi->DefBtn)); if(mbi->Timeout && (mbi->Timeout != (UINT)-1)) - SetTimer(hwnd, 0, mbi->Timeout, NULL); + NtUserSetTimer(hwnd, 0, mbi->Timeout, NULL); } return 0; diff --git a/reactos/dll/win32/user32/windows/nonclient.c b/reactos/dll/win32/user32/windows/nonclient.c index 9f6caf3063c..9db1f60b5f2 100644 --- a/reactos/dll/win32/user32/windows/nonclient.c +++ b/reactos/dll/win32/user32/windows/nonclient.c @@ -285,7 +285,7 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active) Style = GetWindowLongW(hWnd, GWL_STYLE); - hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); + hDC = NtUserGetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); if (hDC == 0) { return 0; @@ -297,13 +297,13 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active) { if (ExStyle & WS_EX_MDICHILD) { - Active = IsChild(GetForegroundWindow(), hWnd); + Active = IsChild(NtUserGetForegroundWindow(), hWnd); if (Active) Active = (hWnd == (HWND)SendMessageW(Parent, WM_MDIGETACTIVE, 0, 0)); } else { - Active = (GetForegroundWindow() == hWnd); + Active = (NtUserGetForegroundWindow() == hWnd); } } GetWindowRect(hWnd, &WindowRect); @@ -546,7 +546,7 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect) if (menu && !(Style & WS_CHILD)) { - HDC hDC = GetWindowDC(hWnd); + HDC hDC = NtUserGetWindowDC(hWnd); if(hDC) { RECT CliRect = *Rect; @@ -911,10 +911,10 @@ DefWndDoButton(HWND hWnd, WPARAM wParam) */ UpdateWindow(hWnd); - WindowDC = GetWindowDC(hWnd); + WindowDC = NtUserGetWindowDC(hWnd); UserDrawCaptionButtonWnd(hWnd, WindowDC, TRUE, ButtonType); - SetCapture(hWnd); + NtUserSetCapture(hWnd); for (;;) { @@ -950,7 +950,7 @@ DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam) case HTCAPTION: { HWND hTopWnd = GetAncestor(hWnd, GA_ROOT); - if (SetActiveWindow(hTopWnd) || GetActiveWindow() == hTopWnd) + if (NtUserSetActiveWindow(hTopWnd) || GetActiveWindow() == hTopWnd) { SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam); } diff --git a/reactos/dll/win32/user32/windows/paint.c b/reactos/dll/win32/user32/windows/paint.c index 16c25e96e5f..597ebdd0234 100644 --- a/reactos/dll/win32/user32/windows/paint.c +++ b/reactos/dll/win32/user32/windows/paint.c @@ -81,45 +81,6 @@ DeleteFrameBrushes(VOID) } } -/* - * @implemented - */ -HDC -WINAPI -BeginPaint( - HWND hwnd, - LPPAINTSTRUCT lpPaint) -{ - return NtUserBeginPaint(hwnd, lpPaint); -} - - -/* - * @implemented - */ -BOOL -WINAPI -EndPaint( - HWND hWnd, - CONST PAINTSTRUCT *lpPaint) -{ - return NtUserEndPaint(hWnd, lpPaint); -} - - -/* - * @unimplemented - */ -int -WINAPI -ExcludeUpdateRgn( - HDC hDC, - HWND hWnd) -{ - UNIMPLEMENTED; - return 0; -} - /* * @implemented @@ -149,37 +110,6 @@ GetUpdateRgn( } - - -/* - * @implemented - */ -BOOL -WINAPI -InvalidateRgn( - HWND hWnd, - HRGN hRgn, - BOOL bErase) -{ - return NtUserInvalidateRgn(hWnd, hRgn, bErase); -} - - -/* - * @implemented - */ -BOOL -WINAPI -RedrawWindow( - HWND hWnd, - CONST RECT *lprcUpdate, - HRGN hrgnUpdate, - UINT flags) -{ - return NtUserRedrawWindow(hWnd, lprcUpdate, hrgnUpdate, flags); -} - - /* * @implemented */ @@ -224,7 +154,7 @@ WINAPI UpdateWindow( HWND hWnd) { - return RedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); + return NtUserRedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); } @@ -239,7 +169,7 @@ ValidateRect( { /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, but Wine dont so i removed it... */ - return RedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); + return NtUserRedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); } @@ -254,7 +184,7 @@ ValidateRgn( { /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, but Wine dont so i removed it... */ - return RedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); + return NtUserRedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); } diff --git a/reactos/dll/win32/user32/windows/window.c b/reactos/dll/win32/user32/windows/window.c index f508381322e..9cecd828b96 100644 --- a/reactos/dll/win32/user32/windows/window.c +++ b/reactos/dll/win32/user32/windows/window.c @@ -99,7 +99,7 @@ BringWindowToTop(HWND hWnd) VOID WINAPI SwitchToThisWindow(HWND hwnd, BOOL fUnknown) { - ShowWindow(hwnd, SW_SHOW); + NtUserShowWindow(hwnd, SW_SHOW); } @@ -327,7 +327,7 @@ CreateWindowExA(DWORD dwExStyle, { TRACE("Restoring current maximized child %p\n", top_child); SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow(top_child, SW_RESTORE); + NtUserShowWindow(top_child, SW_RESTORE); SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); } } @@ -433,7 +433,7 @@ CreateWindowExW(DWORD dwExStyle, { TRACE("Restoring current maximized child %p\n", top_child); SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow(top_child, SW_RESTORE); + NtUserShowWindow(top_child, SW_RESTORE); SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); } } @@ -488,22 +488,12 @@ DeferWindowPos(HDWP hWinPosInfo, #if 0 return NtUserDeferWindowPos(hWinPosInfo, hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); #else - SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); + NtUserSetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); return hWinPosInfo; #endif } -/* - * @implemented - */ -BOOL WINAPI -DestroyWindow(HWND hWnd) -{ - return NtUserDestroyWindow(hWnd); -} - - /* * @unimplemented */ @@ -544,15 +534,6 @@ GetDesktopWindow(VOID) } -/* - * @unimplemented - */ -HWND WINAPI -GetForegroundWindow(VOID) -{ - return NtUserGetForegroundWindow(); -} - static BOOL User32EnumWindows(HDESK hDesktop, HWND hWndparent, @@ -915,17 +896,6 @@ GetClientRect(HWND hWnd, LPRECT lpRect) } -/* - * @implemented - */ -BOOL WINAPI -GetGUIThreadInfo(DWORD idThread, - LPGUITHREADINFO lpgui) -{ - return (BOOL)NtUserGetGUIThreadInfo(idThread, lpgui); -} - - /* * @implemented */ @@ -1012,17 +982,6 @@ GetProcessDefaultLayout(DWORD *pdwDefaultLayout) } -/* - * @implemented - */ -BOOL WINAPI -GetTitleBarInfo(HWND hwnd, - PTITLEBARINFO pti) -{ - return NtUserGetTitleBarInfo(hwnd, pti); -} - - /* * @implemented */ @@ -1129,17 +1088,6 @@ GetWindowModuleFileNameW(HWND hwnd, } -/* - * @implemented - */ -BOOL WINAPI -GetWindowPlacement(HWND hWnd, - WINDOWPLACEMENT *lpwndpl) -{ - return (BOOL)NtUserGetWindowPlacement(hWnd, lpwndpl); -} - - /* * @implemented */ @@ -1510,21 +1458,6 @@ LockSetForegroundWindow(UINT uLockCode) } -/* - * @implemented - */ -BOOL WINAPI -MoveWindow(HWND hWnd, - int X, - int Y, - int nWidth, - int nHeight, - BOOL bRepaint) -{ - return NtUserMoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); -} - - /* * @implemented */ @@ -1549,7 +1482,7 @@ AnimateWindow(HWND hwnd, return FALSE; } - ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + NtUserShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); return TRUE; } @@ -1564,7 +1497,7 @@ OpenIcon(HWND hWnd) if (!(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) return FALSE; - ShowWindow(hWnd,SW_RESTORE); + NtUserShowWindow(hWnd,SW_RESTORE); return TRUE; } @@ -1589,17 +1522,6 @@ SetForegroundWindow(HWND hWnd) } -/* - * @implemented - */ -HWND WINAPI -SetParent(HWND hWndChild, - HWND hWndNewParent) -{ - return NtUserSetParent(hWndChild, hWndNewParent); -} - - /* * @unimplemented */ @@ -1614,33 +1536,6 @@ SetProcessDefaultLayout(DWORD dwDefaultLayout) } -/* - * @unimplemented - */ -BOOL WINAPI -SetWindowPlacement(HWND hWnd, - CONST WINDOWPLACEMENT *lpwndpl) -{ - return (BOOL)NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetWindowPos(HWND hWnd, - HWND hWndInsertAfter, - int X, - int Y, - int cx, - int cy, - UINT uFlags) -{ - return NtUserSetWindowPos(hWnd,hWndInsertAfter, X, Y, cx, cy, uFlags); -} - - /* * @implemented */ @@ -1712,28 +1607,6 @@ ShowOwnedPopups(HWND hWnd, } -/* - * @implemented - */ -BOOL WINAPI -ShowWindow(HWND hWnd, - int nCmdShow) -{ - return NtUserShowWindow(hWnd, nCmdShow); -} - - -/* - * @unimplemented - */ -BOOL WINAPI -ShowWindowAsync(HWND hWnd, - int nCmdShow) -{ - return NtUserShowWindowAsync(hWnd, nCmdShow); -} - - /* * @unimplemented */ diff --git a/reactos/dll/win32/user32/windows/winpos.c b/reactos/dll/win32/user32/windows/winpos.c index c6f50e5a4ff..e86ad184e73 100644 --- a/reactos/dll/win32/user32/windows/winpos.c +++ b/reactos/dll/win32/user32/windows/winpos.c @@ -60,13 +60,13 @@ WinPosActivateOtherWindow(HWND hwnd) } done: - fg = GetForegroundWindow(); + fg = NtUserGetForegroundWindow(); TRACE("win = %p fg = %p\n", hwndTo, fg); if (!fg || (hwnd == fg)) { if (SetForegroundWindow( hwndTo )) return; } - if (!SetActiveWindow( hwndTo )) SetActiveWindow(0); + if (!NtUserSetActiveWindow( hwndTo )) NtUserSetActiveWindow(0); } @@ -102,14 +102,6 @@ GetActiveWindow(VOID) return (HWND)NtUserGetThreadState(THREADSTATE_ACTIVEWINDOW); } -/* - * @implemented - */ -HWND WINAPI -SetActiveWindow(HWND hWnd) -{ - return(NtUserSetActiveWindow(hWnd)); -} /* * @unimplemented