Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 57091: [Win32SS] - Fixed skip test regression in User32 Win wine test. - Regressed one scroll control test. AbiWord scrolls and Explorer redraw issue still the same. - WIP: Rearranged co...
by jimtabor＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: jimtabor Date: Sat Aug 18 00:59:35 2012 New Revision: 57091 URL: http://svn.reactos.org/svn/reactos?rev=57091&view=rev Log: [Win32SS] - Fixed skip test regression in User32 Win wine test. - Regressed one scroll control test. AbiWord scrolls and Explorer redraw issue still the same. - WIP: Rearranged code for standard structures prior to moving scroll code to Win32k. Proc support will remain in User32 (A2W etc) and redirected to Win32k. Drawing support will be added when this switch is made. Then ReactOS will have 100 percent wine scrolls plus our fixes in one file. Modified: trunk/reactos/include/reactos/undocuser.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/user32/controls/scrollbar.c Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Aug 18 00:59:35 2012 @@ -68,6 +68,9 @@ #define SWP_NOCLIENTMOVE 0x1000 #define SWP_STATECHANGED 0x8000 +/* NtUserSetScrollInfo mask to return original position before it is change */ +#define SIF_PREVIOUSPOS 4096 + /* Non SDK Queue state flags. */ #define QS_SMRESULT 0x8000 /* see "Undoc. Windows" */ Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Aug 18 00:59:35 2012 @@ -608,7 +608,7 @@ pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND return 0; - TRACE("Internal Event Msg %p\n",msg); + TRACE("Internal Event Msg %p hWnd 0x%x\n",msg,pWnd->head.h); switch(msg) { @@ -742,7 +742,6 @@ BOOL bGMSG ) { PTHREADINFO pti; - //PCLIENTINFO pci; LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; BOOL RemoveMessages; @@ -751,10 +750,14 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - //pci = pti->pClientInfo; RemoveMessages = RemoveMsg & PM_REMOVE; ProcessMask = HIWORD(RemoveMsg); + + if (ThreadQueue->ptiSysLock && ThreadQueue->ptiSysLock != pti) + { + ERR("PeekMessage: Thread Q 0x%p is locked 0x%p to another pti 0x%p!\n", ThreadQueue, ThreadQueue->ptiSysLock, pti ); + } /* Hint, "If wMsgFilterMin and wMsgFilterMax are both zero, PeekMessage returns all available messages (that is, no range filtering is performed)". */ @@ -1182,6 +1185,7 @@ Window = UserGetWindowObject(Wnd); if ( !Window ) { + ERR("UserPostMessage: Invalid handle 0x%p!\n",Wnd); return FALSE; } @@ -1246,6 +1250,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { + TRACE("SendMessageTimeoutSingle: Invalid handle 0x%p!\n",hWnd); RETURN( FALSE); } @@ -1491,6 +1496,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { + TRACE("SendMessageWithCallBack: Invalid handle 0x%p!\n",hWnd); RETURN(FALSE); } @@ -1514,6 +1520,8 @@ if (Msg & 0x80000000 && Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { + if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN( FALSE); + ERR("SMWCB: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); if (uResult) *uResult = Result; @@ -1650,6 +1658,7 @@ if(!(Window = UserGetWindowObject(hWnd))) { + TRACE("PostOrSendMessage: Invalid handle 0x%p!\n",hWnd); return 0; } @@ -2158,6 +2167,8 @@ return Ret; } +LRESULT APIENTRY ScrollBarWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam); + BOOL APIENTRY NtUserMessageCall( HWND hWnd, UINT Msg, @@ -2178,18 +2189,7 @@ { case FNID_SCROLLBAR: { - switch(Msg) - { - case WM_ENABLE: - { - Window = UserGetWindowObject(hWnd); - if (Window->pSBInfo) - { - Window->pSBInfo->WSBflags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; - } - } - break; - } + lResult = ScrollBarWndProc(hWnd, Msg, wParam, lParam); break; } case FNID_DEFWINDOWPROC: @@ -2675,6 +2675,7 @@ case FNID_DEFWINDOWPROC: case FNID_CALLWNDPROC: case FNID_CALLWNDPROCRET: + case FNID_SCROLLBAR: if (ResultInfo) { _SEH2_TRY Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/scrollbar.c [iso-8859-1] Sat Aug 18 00:59:35 2012 @@ -38,42 +38,94 @@ * 'thumbSize' returns the size of the thumb, and 'thumbPos' returns the position of the thumb relative to the left or to * the top. Return TRUE if the scrollbar is vertical, FALSE if horizontal. */ +static inline void mirror_rect( const RECT *window_rect, RECT *rect ) +{ + int width = window_rect->right - window_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + +PSBDATA FASTCALL +IntGetSBData(PWND pwnd, INT Bar) +{ + PSBWND pSBWnd; + PSBINFO pSBInfo; + + pSBInfo = pwnd->pSBInfo; + switch (Bar) + { + case SB_HORZ: + return &pSBInfo->Horz; + case SB_VERT: + return &pSBInfo->Vert; + case SB_CTL: + if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + { + ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); + return 0; + } + pSBWnd = (PSBWND)pwnd; + return (PSBDATA)&pSBWnd->SBCalc; + default: + ERR("IntGetSBData Bad Bar!\n"); + } + return NULL; +} + BOOL FASTCALL IntGetScrollBarRect (PWND Wnd, INT nBar, RECTL *lprect) { BOOL vertical; - RECTL ClientRect = Wnd->rcClient; - RECTL WindowRect = Wnd->rcWindow; + *lprect = Wnd->rcClient; + + RECTL_vOffsetRect( lprect, -Wnd->rcWindow.left, -Wnd->rcWindow.top ); + if (Wnd->ExStyle & WS_EX_LAYOUTRTL) + mirror_rect( &Wnd->rcWindow, lprect ); switch (nBar) { case SB_HORZ: - lprect->left = ClientRect.left - WindowRect.left; - lprect->top = ClientRect.bottom - WindowRect.top; - lprect->right = ClientRect.right - WindowRect.left; - lprect->bottom = lprect->top + UserGetSystemMetrics (SM_CYHSCROLL); + lprect->top = lprect->bottom; + lprect->bottom += UserGetSystemMetrics (SM_CYHSCROLL); + if (Wnd->style & WS_BORDER) + { + lprect->left--; + lprect->right++; + } + else if (Wnd->style & WS_VSCROLL) + { + lprect->right++; + } vertical = FALSE; break; case SB_VERT: if(Wnd->ExStyle & WS_EX_LEFTSCROLLBAR) { - lprect->right = ClientRect.left - WindowRect.left; - lprect->left = lprect->right - UserGetSystemMetrics(SM_CXVSCROLL); + lprect->right = lprect->right;; + lprect->left -= UserGetSystemMetrics(SM_CXVSCROLL); } else { - lprect->left = ClientRect.right - WindowRect.left; - lprect->right = lprect->left + UserGetSystemMetrics(SM_CXVSCROLL); - } - lprect->top = ClientRect.top - WindowRect.top; - lprect->bottom = ClientRect.bottom - WindowRect.top; + lprect->left = lprect->right; + lprect->right += UserGetSystemMetrics(SM_CXVSCROLL); + } + if (Wnd->style & WS_BORDER) + { + lprect->top--; + lprect->bottom++; + } + else if (Wnd->style & WS_HSCROLL) + { + lprect->bottom++; + } vertical = TRUE; break; case SB_CTL: IntGetClientRect (Wnd, lprect); - vertical = ((Wnd->style & SBS_VERT) != 0); + vertical = !!(Wnd->style & SBS_VERT); break; default: @@ -84,7 +136,7 @@ } BOOL FASTCALL -IntCalculateThumb(PWND Wnd, LONG idObject, PSCROLLBARINFO psbi, LPSCROLLINFO psi) +IntCalculateThumb(PWND Wnd, LONG idObject, PSCROLLBARINFO psbi, PSBDATA pSBData) { INT Thumb, ThumbBox, ThumbPos, cxy, mx; RECTL ClientRect; @@ -127,20 +179,20 @@ } else { - ThumbBox = psi->nPage ? MINTRACKTHUMB : UserGetSystemMetrics(SM_CXHTHUMB); + ThumbBox = pSBData->page ? MINTRACKTHUMB : UserGetSystemMetrics(SM_CXHTHUMB); cxy -= (2 * Thumb); if(cxy >= ThumbBox) { - if(psi->nPage) - { - ThumbBox = max(EngMulDiv(cxy, psi->nPage, psi->nMax - psi->nMin + 1), ThumbBox); + if(pSBData->page) + { + ThumbBox = max(EngMulDiv(cxy, pSBData->page, pSBData->posMax - pSBData->posMin + 1), ThumbBox); } if(cxy > ThumbBox) { - mx = psi->nMax - max(psi->nPage - 1, 0); - if(psi->nMin < mx) - ThumbPos = Thumb + EngMulDiv(cxy - ThumbBox, psi->nPos - psi->nMin, mx - psi->nMin); + mx = pSBData->posMax - max(pSBData->page - 1, 0); + if(pSBData->posMin < mx) + ThumbPos = Thumb + EngMulDiv(cxy - ThumbBox, pSBData->pos - pSBData->posMin, mx - pSBData->posMin); else ThumbPos = Thumb + ThumbBox; } @@ -158,25 +210,25 @@ return TRUE; } - +/* static VOID FASTCALL IntUpdateSBInfo(PWND Window, int wBar) { PSCROLLBARINFO sbi; - LPSCROLLINFO psi; + PSBDATA pSBData; ASSERT(Window); ASSERT(Window->pSBInfo); ASSERT(Window->pSBInfoex); sbi = IntGetScrollbarInfoFromWindow(Window, wBar); - psi = IntGetScrollInfoFromWindow(Window, wBar); + pSBData = IntGetSBData(Window, wBar); IntGetScrollBarRect(Window, wBar, &(sbi->rcScrollBar)); - IntCalculateThumb(Window, wBar, sbi, psi); -} - + IntCalculateThumb(Window, wBar, sbi, pSBData); +} +*/ static BOOL FASTCALL -co_IntGetScrollInfo(PWND Window, INT nBar, LPSCROLLINFO lpsi) +co_IntGetScrollInfo(PWND Window, INT nBar, PSBDATA pSBData, LPSCROLLINFO lpsi) { UINT Mask; LPSCROLLINFO psi; @@ -190,7 +242,11 @@ return FALSE; } - if (!Window->pSBInfo) return FALSE; + if (!Window->pSBInfo) + { + ERR("IntGetScrollInfo No window scrollbar info!\n"); + return FALSE; + } psi = IntGetScrollInfoFromWindow(Window, nBar); @@ -288,6 +344,8 @@ PSCROLLBARINFO psbi; UINT new_flags; INT action = 0; + PSBDATA pSBData; + DWORD OldPos; BOOL bChangeParams = FALSE; /* Don't show/hide scrollbar if params don't change */ ASSERT_REFS_CO(Window); @@ -310,7 +368,7 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (lpsi->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) + if (lpsi->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL | SIF_PREVIOUSPOS)) { EngSetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -318,6 +376,7 @@ psbi = IntGetScrollbarInfoFromWindow(Window, nBar); Info = IntGetScrollInfoFromWindow(Window, nBar); + pSBData = IntGetSBData(Window, nBar); /* Set the page size */ if (lpsi->fMask & SIF_PAGE) @@ -325,6 +384,7 @@ if (Info->nPage != lpsi->nPage) { Info->nPage = lpsi->nPage; + pSBData->page = lpsi->nPage; bChangeParams = TRUE; } } @@ -334,7 +394,9 @@ { if (Info->nPos != lpsi->nPos) { + OldPos = Info->nPos; Info->nPos = lpsi->nPos; + pSBData->pos = lpsi->nPos; bChangeParams = TRUE; } } @@ -348,32 +410,38 @@ { Info->nMin = 0; Info->nMax = 0; + pSBData->posMin = 0; + pSBData->posMax = 0; bChangeParams = TRUE; } else if (Info->nMin != lpsi->nMin || Info->nMax != lpsi->nMax) { Info->nMin = lpsi->nMin; Info->nMax = lpsi->nMax; + pSBData->posMin = lpsi->nMin; + pSBData->posMax = lpsi->nMax; bChangeParams = TRUE; } } /* Make sure the page size is valid */ if (Info->nPage < 0) - Info->nPage = 0; + { + pSBData->page = Info->nPage = 0; + } else if ((Info->nMax - Info->nMin + 1UL) < Info->nPage) { - Info->nPage = Info->nMax - Info->nMin + 1; + pSBData->page = Info->nPage = Info->nMax - Info->nMin + 1; } /* Make sure the pos is inside the range */ if (Info->nPos < Info->nMin) { - Info->nPos = Info->nMin; + pSBData->pos = Info->nPos = Info->nMin; } else if (Info->nPos > (Info->nMax - max((int)Info->nPage - 1, 0))) { - Info->nPos = Info->nMax - max(Info->nPage - 1, 0); + pSBData->pos = Info->nPos = Info->nMax - max(Info->nPage - 1, 0); } /* @@ -382,7 +450,8 @@ */ if (!(lpsi->fMask & SIF_ALL)) { - goto done; //return Info->nPos; + //goto done; + return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; } /* Check if the scrollbar should be hidden or disabled */ @@ -419,7 +488,7 @@ } } -done: +//done: if ( action & SA_SSI_HIDE ) { co_UserShowScrollBar(Window, nBar, FALSE, FALSE); @@ -428,7 +497,7 @@ { if ( action & SA_SSI_SHOW ) if ( co_UserShowScrollBar(Window, nBar, TRUE, TRUE) ) - return Info->nPos; /* SetWindowPos() already did the painting */ + return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; /* SetWindowPos() already did the painting */ if (bRedraw) { // FIXME: Arrows and interior. RECTL UpdateRect = psbi->rcScrollBar; @@ -438,7 +507,7 @@ UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } // FIXME: Arrows - else if( action & SA_SSI_REPAINT_ARROWS ) +/* else if( action & SA_SSI_REPAINT_ARROWS ) { RECTL UpdateRect = psbi->rcScrollBar; UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; @@ -447,9 +516,9 @@ UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } - } +*/ } /* Return current position */ - return Info->nPos; + return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; } BOOL FASTCALL @@ -457,7 +526,7 @@ { INT Bar; PSCROLLBARINFO sbi; - LPSCROLLINFO psi; + PSBDATA pSBData; ASSERT_REFS_CO(Window); Bar = SBOBJ_TO_SBID(idObject); @@ -471,14 +540,15 @@ if(!co_IntCreateScrollBars(Window)) { + ERR("Failed to create scrollbars for window.\n"); return FALSE; } sbi = IntGetScrollbarInfoFromWindow(Window, Bar); - psi = IntGetScrollInfoFromWindow(Window, Bar); + pSBData = IntGetSBData(Window, Bar); IntGetScrollBarRect(Window, Bar, &(sbi->rcScrollBar)); - IntCalculateThumb(Window, Bar, sbi, psi); + IntCalculateThumb(Window, Bar, sbi, pSBData); RtlCopyMemory(psbi, sbi, sizeof(SCROLLBARINFO)); @@ -489,7 +559,7 @@ co_IntCreateScrollBars(PWND Window) { PSCROLLBARINFO psbi; - LPSCROLLINFO psi; + PSBDATA pSBData; ULONG Size, s; INT i; @@ -532,12 +602,10 @@ for (i = 0; i < CCHILDREN_SCROLLBAR + 1; i++) psbi->rgstate[i] = 0; - psi = IntGetScrollInfoFromWindow(Window, s); - psi->cbSize = sizeof(LPSCROLLINFO); - psi->nMax = 100; + pSBData = IntGetSBData(Window, s); IntGetScrollBarRect(Window, s, &(psbi->rcScrollBar)); - IntCalculateThumb(Window, s, psbi, psi); + IntCalculateThumb(Window, s, psbi, pSBData); } return TRUE; @@ -607,7 +675,7 @@ { case SB_CTL: { - if (Wnd->pSBInfo) IntUpdateSBInfo(Wnd, SB_CTL); // Is this needed? Was tested w/o! + //IntUpdateSBInfo(Wnd, SB_CTL); // Is this needed? Was tested w/o! co_WinPosShowWindow(Wnd, fShowH ? SW_SHOW : SW_HIDE); return TRUE; @@ -627,20 +695,12 @@ return FALSE; } - - old_style = Wnd->style; - Wnd->style = (Wnd->style | set_bits) & ~clear_bits; - - if (fShowH || fShowV) - { - if (!Wnd->pSBInfo) co_IntCreateScrollBars(Wnd); - } - + old_style = IntSetStyle( Wnd, set_bits, clear_bits ); if ((old_style & clear_bits) != 0 || (old_style & set_bits) != set_bits) { ///// Is this needed? Was tested w/o! - if (Wnd->style & WS_HSCROLL) IntUpdateSBInfo(Wnd, SB_HORZ); - if (Wnd->style & WS_VSCROLL) IntUpdateSBInfo(Wnd, SB_VERT); + //if (Wnd->style & WS_HSCROLL) IntUpdateSBInfo(Wnd, SB_HORZ); + //if (Wnd->style & WS_VSCROLL) IntUpdateSBInfo(Wnd, SB_VERT); ///// /* Frame has been changed, let the window redraw itself */ co_WinPosSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | @@ -648,6 +708,28 @@ return TRUE; } return FALSE; +} + +LRESULT APIENTRY +ScrollBarWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + LRESULT lResult = 0; + PWND pWnd; + pWnd = UserGetWindowObject(hWnd); + if (!pWnd) return 0; + + switch(Msg) + { + case WM_ENABLE: + { + if (pWnd->pSBInfo) + { + pWnd->pSBInfo->WSBflags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; + } + } + break; + } + return lResult; } //// @@ -706,47 +788,53 @@ PSBDATA pSBData, LPSCROLLINFO lpsi) { - NTSTATUS Status; PWND Window; SCROLLINFO psi; - DWORD sz; BOOL Ret; + SBDATA SBDataSafe; DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserGetScrollInfo\n"); - UserEnterExclusive(); - - Status = MmCopyFromCaller(&psi.cbSize, &(lpsi->cbSize), sizeof(UINT)); - if(!NT_SUCCESS(Status) || - !((psi.cbSize == sizeof(SCROLLINFO)) || (psi.cbSize == sizeof(SCROLLINFO) - sizeof(psi.nTrackPos)))) - { - SetLastNtError(Status); + UserEnterShared(); + + _SEH2_TRY + { + RtlCopyMemory(&psi, lpsi, sizeof(SCROLLINFO)); + if (pSBData) + { + RtlCopyMemory(&SBDataSafe, pSBData, sizeof(SBDATA)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("NtUserGetScrollInfo Failed size.\n"); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN(FALSE)); + } + _SEH2_END + + if(!(Window = UserGetWindowObject(hWnd))) + { + ERR("NtUserGetScrollInfo Bad window.\n"); RETURN(FALSE); } - sz = psi.cbSize; - Status = MmCopyFromCaller(&psi, lpsi, sz); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN(FALSE); - } - - if(!(Window = UserGetWindowObject(hWnd))) - { - RETURN(FALSE); - } UserRefObjectCo(Window, &Ref); - Ret = co_IntGetScrollInfo(Window, fnBar, &psi); + Ret = co_IntGetScrollInfo(Window, fnBar, &SBDataSafe, &psi); UserDerefObjectCo(Window); - Status = MmCopyToCaller(lpsi, &psi, sz); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } + _SEH2_TRY + { + RtlCopyMemory(lpsi, &psi, sizeof(SCROLLINFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("NtUserGetScrollInfo Failed copy to user.\n"); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN(FALSE)); + } + _SEH2_END RETURN( Ret); @@ -773,7 +861,9 @@ TRACE("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: + Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND { RETURN(FALSE); } @@ -827,6 +917,7 @@ // Done in user32: // SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); + RETURN( Chg); if (OrigArrows == wArrows) RETURN( FALSE); RETURN( TRUE); @@ -856,7 +947,9 @@ TRACE("Enter NtUserSetScrollInfo\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd))) + if(!(Window = UserGetWindowObject(hWnd)) || // FIXME: + Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND { RETURN( 0); } Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Sat Aug 18 00:59:35 2012 @@ -55,6 +55,9 @@ /* Minimum size of the thumb in pixels */ #define SCROLL_MIN_THUMB 6 + /* Overlap between arrows and thumb */ +#define SCROLL_ARROW_THUMB_OVERLAP 0 + /* Thumb-tracking info */ static HWND ScrollTrackingWin = 0; static INT ScrollTrackingBar = 0; @@ -86,6 +89,32 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static PSBDATA +IntGetSBData(PWND pwnd, INT Bar) +{ + PSBWND pSBWnd; + PSBINFO pSBInfo; + + pSBInfo = DesktopPtrToUser(pwnd->pSBInfo); + switch (Bar) + { + case SB_HORZ: + return &pSBInfo->Horz; + case SB_VERT: + return &pSBInfo->Vert; + case SB_CTL: + if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + { + ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); + return 0; + } + pSBWnd = (PSBWND)pwnd; + return (PSBDATA)&pSBWnd->SBCalc; + default: + ERR("IntGetSBData Bad Bar!\n"); + } + return NULL; +} static void IntDrawScrollInterior(HWND hWnd, HDC hDC, INT nBar, BOOL Vertical, @@ -253,25 +282,16 @@ INT OldTop; if (Vertical) - { MaxSize = ScrollBarInfo->rcScrollBar.bottom - ScrollBarInfo->rcScrollBar.top; - } else - { MaxSize = ScrollBarInfo->rcScrollBar.right - ScrollBarInfo->rcScrollBar.left; - } - - MaxSize -= ScrollBarInfo->dxyLineButton + ScrollBarInfo->xyThumbBottom - - ScrollBarInfo->xyThumbTop; + + MaxSize -= ScrollBarInfo->dxyLineButton + ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop; if (Pos < ScrollBarInfo->dxyLineButton) - { Pos = ScrollBarInfo->dxyLineButton; - } else if (MaxSize < Pos) - { Pos = MaxSize; - } OldTop = ScrollBarInfo->xyThumbTop; ScrollBarInfo->xyThumbBottom = Pos + ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop; @@ -280,21 +300,16 @@ ScrollBarInfo->xyThumbBottom = OldTop + ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop; ScrollBarInfo->xyThumbTop = OldTop; - ScrollMovingThumb = ! ScrollMovingThumb; + ScrollMovingThumb = !ScrollMovingThumb; } static LONG FASTCALL IntScrollGetObjectId(INT SBType) { - if (SB_VERT == SBType) - { + if (SBType == SB_VERT) return OBJID_VSCROLL; - } - if (SB_HORZ == SBType) - { + if (SBType == SB_HORZ) return OBJID_HSCROLL; - } - return OBJID_CLIENT; } @@ -334,15 +349,15 @@ default: return; } - if (! IntGetScrollBarInfo(Wnd, Bar, &Info)) - { + if (!IntGetScrollBarInfo(Wnd, Bar, &Info)) + { return; - } + } if (IsRectEmpty(&Info.rcScrollBar)) - { + { return; - } + } //ThumbSize = pSBWnd->pSBCalc->pxThumbBottom - pSBWnd->pSBCalc->pxThumbTop; @@ -350,9 +365,9 @@ * Draw the arrows. */ if (Info.dxyLineButton) - { + { IntDrawScrollArrows(DC, &Info, Vertical); - } + } /* * Draw the interior. @@ -363,34 +378,44 @@ * If scroll bar has focus, reposition the caret. */ if (Wnd == GetFocus() && SB_CTL == Bar) - { + { if (Vertical) - { + { SetCaretPos(Info.rcScrollBar.top + 1, Info.dxyLineButton + 1); - } + } else - { + { SetCaretPos(Info.dxyLineButton + 1, Info.rcScrollBar.top + 1); - } - } + } + } } static BOOL FASTCALL IntScrollPtInRectEx(LPRECT Rect, POINT Pt, BOOL Vertical) { RECT TempRect = *Rect; + int scrollbarWidth; + + /* Pad hit rect to allow mouse to be dragged outside of scrollbar and + * still be considered in the scrollbar. */ if (Vertical) - { - TempRect.left -= Rect->right - Rect->left; - TempRect.right += Rect->right - Rect->left; - } - else - { - TempRect.top -= Rect->bottom - Rect->top; - TempRect.bottom += Rect->bottom - Rect->top; - } - - return PtInRect(&TempRect, Pt); + { + scrollbarWidth = Rect->right - Rect->left; + TempRect.left -= scrollbarWidth*8; + TempRect.right += scrollbarWidth*8; + TempRect.top -= scrollbarWidth*2; + TempRect.bottom += scrollbarWidth*2; + } + else + { + scrollbarWidth = Rect->bottom - Rect->top; + TempRect.left -= scrollbarWidth*2; + TempRect.right += scrollbarWidth*2; + TempRect.top -= scrollbarWidth*8; + TempRect.bottom += scrollbarWidth*8; + } + + return PtInRect(&TempRect, Pt); } static DWORD FASTCALL @@ -399,63 +424,30 @@ INT ArrowSize, ThumbSize, ThumbPos; if ((Dragging && ! IntScrollPtInRectEx(&ScrollBarInfo->rcScrollBar, Pt, Vertical)) || - ! PtInRect(&ScrollBarInfo->rcScrollBar, Pt)) - { - return SCROLL_NOWHERE; - } + ! PtInRect(&ScrollBarInfo->rcScrollBar, Pt)) return SCROLL_NOWHERE; ThumbPos = ScrollBarInfo->xyThumbTop; ThumbSize = ScrollBarInfo->xyThumbBottom - ThumbPos; ArrowSize = ScrollBarInfo->dxyLineButton; if (Vertical) - { - if (Pt.y < ScrollBarInfo->rcScrollBar.top + ArrowSize) - { - return SCROLL_TOP_ARROW; - } - if (ScrollBarInfo->rcScrollBar.bottom - ArrowSize <= Pt.y) - { - return SCROLL_BOTTOM_ARROW; - } - if (0 == ThumbPos) - { - return SCROLL_TOP_RECT; - } + { + if (Pt.y < ScrollBarInfo->rcScrollBar.top + ArrowSize) return SCROLL_TOP_ARROW; + if (Pt.y >= ScrollBarInfo->rcScrollBar.bottom - ArrowSize) return SCROLL_BOTTOM_ARROW; + if (!ThumbPos) return SCROLL_TOP_RECT; Pt.y -= ScrollBarInfo->rcScrollBar.top; - if (Pt.y < ThumbPos) - { - return SCROLL_TOP_RECT; - } - if (ThumbPos + ThumbSize <= Pt.y) - { - return SCROLL_BOTTOM_RECT; - } - } + if (Pt.y < ThumbPos) return SCROLL_TOP_RECT; + if (Pt.y >= ThumbPos + ThumbSize) return SCROLL_BOTTOM_RECT; + } else - { - if (Pt.x < ScrollBarInfo->rcScrollBar.left + ArrowSize) - { - return SCROLL_TOP_ARROW; - } - if (ScrollBarInfo->rcScrollBar.right - ArrowSize <= Pt.x) - { - return SCROLL_BOTTOM_ARROW; - } - if (0 == ThumbPos) - { - return SCROLL_TOP_RECT; - } + { + if (Pt.x < ScrollBarInfo->rcScrollBar.left + ArrowSize) return SCROLL_TOP_ARROW; + if (Pt.x >= ScrollBarInfo->rcScrollBar.right - ArrowSize) return SCROLL_BOTTOM_ARROW; + if (!ThumbPos) return SCROLL_TOP_RECT; Pt.x -= ScrollBarInfo->rcScrollBar.left; - if (Pt.x < ThumbPos) - { - return SCROLL_TOP_RECT; - } - if (ThumbPos + ThumbSize <= Pt.x) - { - return SCROLL_BOTTOM_RECT; - } - } + if (Pt.x < ThumbPos) return SCROLL_TOP_RECT; + if (Pt.x >= ThumbPos + ThumbSize) return SCROLL_BOTTOM_RECT; + } return SCROLL_THUMB; } @@ -479,145 +471,113 @@ { INT Pixels; BOOL Vertical; - RECT ClientRect; - RECT WindowRect; - DWORD Style, ExStyle; PWND pWnd; PSBINFO pSBInfo; + PSBDATA pSBData; + PSBWND pSBWnd; pWnd = ValidateHwnd( Wnd ); + if (!pWnd) return FALSE; pSBInfo = DesktopPtrToUser(pWnd->pSBInfo); - GetClientRect(Wnd, &ClientRect); - if (SB_HORZ == Bar || SB_VERT == Bar) - { - ClientToScreen(Wnd, (LPPOINT) &ClientRect.left); - ClientToScreen(Wnd, (LPPOINT) &ClientRect.right); - GetWindowRect(Wnd, &WindowRect); - } - Style = GetWindowLongPtrW(Wnd, GWL_STYLE); + *Rect = pWnd->rcClient; + OffsetRect( Rect, -pWnd->rcWindow.left, -pWnd->rcWindow.top ); + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + mirror_rect( &pWnd->rcWindow, Rect ); switch (Bar) { case SB_HORZ: - Rect->left = ClientRect.left - WindowRect.left; - Rect->top = ClientRect.bottom - WindowRect.top; - Rect->right = ClientRect.right - WindowRect.left; - Rect->bottom = Rect->top + GetSystemMetrics(SM_CYHSCROLL); - if (0 != (Style & WS_BORDER)) - { +// WIN_GetRectangles( Wnd, COORDS_WINDOW, NULL, Rect ); + Rect->top = Rect->bottom; + Rect->bottom += GetSystemMetrics(SM_CYHSCROLL); + if (pWnd->style & WS_BORDER) + { Rect->left--; Rect->right++; - } - else if (0 != (Style & WS_VSCROLL)) - { + } + else if (pWnd->style & WS_VSCROLL) + { Rect->right++; - } + } Vertical = FALSE; + pSBData = &pSBInfo->Horz; break; case SB_VERT: - ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE); - if (0 != (ExStyle & WS_EX_LEFTSCROLLBAR)) - { - Rect->left = ClientRect.left - WindowRect.left - GetSystemMetrics(SM_CXVSCROLL); - } +// WIN_GetRectangles( Wnd, COORDS_WINDOW, NULL, Rect ); + if (pWnd->ExStyle & WS_EX_LEFTSCROLLBAR) + { + Rect->right = Rect->left; + Rect->left -= GetSystemMetrics(SM_CXVSCROLL); + } else - { - Rect->left = ClientRect.right - WindowRect.left; - } - Rect->top = ClientRect.top - WindowRect.top; - Rect->right = Rect->left + GetSystemMetrics(SM_CXVSCROLL); - Rect->bottom = ClientRect.bottom - WindowRect.top; - if (0 != (Style & WS_BORDER)) - { + { + Rect->left = Rect->right; + Rect->right += GetSystemMetrics(SM_CXVSCROLL); + } + if (pWnd->style & WS_BORDER) + { Rect->top--; Rect->bottom++; - } - else if (0 != (Style & WS_HSCROLL)) - { + } + else if (pWnd->style & WS_HSCROLL) + { Rect->bottom++; - } + } Vertical = TRUE; + pSBData = &pSBInfo->Vert; break; case SB_CTL: - *Rect = ClientRect; - Vertical = (0 != (Style & SBS_VERT)); + GetClientRect( Wnd, Rect ); + Vertical = (pWnd->style & SBS_VERT); + pSBWnd = (PSBWND)pWnd; + pSBData = (PSBDATA)&pSBWnd->SBCalc; break; default: return FALSE; } - if (Vertical) - { - Pixels = Rect->bottom - Rect->top; - } + if (Vertical) Pixels = Rect->bottom - Rect->top; + else Pixels = Rect->right - Rect->left; + + if (Pixels <= 2 * GetSystemMetrics(SM_CXVSCROLL) + SCROLL_MIN_RECT) + { + if (SCROLL_MIN_RECT < Pixels) + *ArrowSize = (Pixels - SCROLL_MIN_RECT) / 2; + else + *ArrowSize = 0; + *ThumbPos = *ThumbSize = 0; + } else - { - Pixels = Rect->right - Rect->left; - } - - if (Pixels <= 2 * GetSystemMetrics(SM_CXVSCROLL) + SCROLL_MIN_RECT) - { - if (SCROLL_MIN_RECT < Pixels) - { - *ArrowSize = (Pixels - SCROLL_MIN_RECT) / 2; - } - else - { - *ArrowSize = 0; - } - *ThumbPos = *ThumbSize = 0; - } - else - { - SCROLLINFO Info; - - NtUserSBGetParms(Wnd, Bar, NULL, &Info); + { *ArrowSize = GetSystemMetrics(SM_CXVSCROLL); - Pixels -= (2 * GetSystemMetrics(SM_CXVSCROLL)); - - if (0 != Info.nPage) + Pixels -= (2 * (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP)); + if (pSBData->page) { - *ThumbSize = MulDiv(Pixels, Info.nPage, (Info.nMax - Info.nMin + 1)); - if (*ThumbSize < SCROLL_MIN_THUMB) - { - *ThumbSize = SCROLL_MIN_THUMB; - } + *ThumbSize = MulDiv(Pixels, pSBData->page, (pSBData->posMax - pSBData->posMin + 1)); + if (*ThumbSize < SCROLL_MIN_THUMB) *ThumbSize = SCROLL_MIN_THUMB; } - else - { - *ThumbSize = GetSystemMetrics(SM_CXVSCROLL); - } - -//#if 0 /* FIXME */ + else *ThumbSize = GetSystemMetrics(SM_CXVSCROLL); + if (((Pixels -= *ThumbSize ) < 0) || (( pSBInfo->WSBflags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)) -//#else -// if ((Pixels -= *ThumbSize ) < 0) -//#endif { /* Rectangle too small or scrollbar disabled -> no thumb */ *ThumbPos = *ThumbSize = 0; } else { - INT Max = Info.nMax - max(Info.nPage - 1, 0); - if (Max <= Info.nMin) - { - *ThumbPos = *ArrowSize; - } + INT Max = pSBData->posMax - max(pSBData->page - 1, 0); + if (pSBData->posMin >= Max) + *ThumbPos = *ArrowSize - SCROLL_ARROW_THUMB_OVERLAP; else - { - *ThumbPos = *ArrowSize - + MulDiv(Pixels, (Info.nPos - Info.nMin), - (Max - Info.nMin)); - } + *ThumbPos = *ArrowSize - SCROLL_ARROW_THUMB_OVERLAP + + MulDiv(Pixels, (pSBData->pos - pSBData->posMin),(Max - pSBData->posMin)); } } - return Vertical; } @@ -631,70 +591,61 @@ IntScrollGetThumbVal(HWND Wnd, INT SBType, PSCROLLBARINFO ScrollBarInfo, BOOL Vertical, INT Pos) { - SCROLLINFO si; + PWND pWnd; + PSBDATA pSBData; INT Pixels = Vertical ? ScrollBarInfo->rcScrollBar.bottom - ScrollBarInfo->rcScrollBar.top : ScrollBarInfo->rcScrollBar.right - ScrollBarInfo->rcScrollBar.left; - si.cbSize = sizeof(SCROLLINFO); - si.fMask = SIF_RANGE | SIF_PAGE; - NtUserSBGetParms(Wnd, SBType, NULL, &si); + pWnd = ValidateHwnd( Wnd ); + if (!pWnd) return FALSE; + + pSBData = IntGetSBData(pWnd, SBType); + if ((Pixels -= 2 * ScrollBarInfo->dxyLineButton) <= 0) - { - return si.nMin; - } + { + return pSBData->posMin; + } if ((Pixels -= (ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop)) <= 0) - { - return si.nMin; - } + { + return pSBData->posMin; + } Pos = Pos - ScrollBarInfo->dxyLineButton; if (Pos < 0) - { + { Pos = 0; - } - if (Pixels < Pos) - { - Pos = Pixels; - } - - if (0 == si.nPage) - { - Pos *= si.nMax - si.nMin; - } + } + if (Pos > Pixels) Pos = Pixels; + + if (!pSBData->page) + Pos *= pSBData->posMax - pSBData->posMin; else - { - Pos *= si.nMax - si.nMin - si.nPage + 1; - } - return si.nMin + ((Pos + Pixels / 2) / Pixels); + Pos *= pSBData->posMax - pSBData->posMin - pSBData->page + 1; + + return pSBData->posMin + ((Pos + Pixels / 2) / Pixels); } /*********************************************************************** * IntScrollClipPos */ -static POINT IntScrollClipPos(PRECT Rect, POINT Pt) -{ - if (Pt.x < Rect->left) - { - Pt.x = Rect->left; - } - else if (Rect->right < Pt.x) - { - Pt.x = Rect->right; - } - - if (Pt.y < Rect->top) - { - Pt.y = Rect->top; - } - else if (Rect->bottom < Pt.y) - { - Pt.y = Rect->bottom; - } - - return Pt; +static POINT IntScrollClipPos(PRECT lpRect, POINT pt) +{ + if( pt.x < lpRect->left ) + pt.x = lpRect->left; + else + if( pt.x > lpRect->right ) + pt.x = lpRect->right; + + if( pt.y < lpRect->top ) + pt.y = lpRect->top; + else + if( pt.y > lpRect->bottom ) + pt.y = lpRect->bottom; + + return pt; } /*********************************************************************** @@ -895,9 +846,9 @@ ScrollBarInfo.rgstate[ScrollTrackHitTest] &= ~STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); - + IntDrawScrollArrows(Dc, &ScrollBarInfo, Vertical); - + break; case WM_SYSTIMER: @@ -1092,7 +1043,7 @@ TRACE("hwnd=%p lpCreate=%p\n", Wnd, lpCreate); -//#if 0 /* FIXME */ +#if 0 /* FIXME */ if (lpCreate->style & WS_DISABLED) { // info->flags = ESB_DISABLE_BOTH; @@ -1100,7 +1051,7 @@ NtUserMessageCall( Wnd, WM_ENABLE, FALSE, 0, 0, FNID_SCROLLBAR, FALSE); ERR("Created WS_DISABLED scrollbar\n"); } -//#endif +#endif if (0 != (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX))) { if (0 != (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN)) @@ -1146,42 +1097,6 @@ lpCreate->cx, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); } } -} - -static INT FASTCALL -IntScrollGetScrollPos(HWND Wnd, INT Bar) -{ - SCROLLINFO ScrollInfo; - - ScrollInfo.cbSize = sizeof(SCROLLINFO); - ScrollInfo.fMask = SIF_POS; - if (!NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo)) - { - return 0; - } - - return ScrollInfo.nPos; -} - -static BOOL FASTCALL -IntScrollGetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) -{ - BOOL Result; - SCROLLINFO ScrollInfo; - - if (NULL == MinPos || NULL == MaxPos) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - ScrollInfo.cbSize = sizeof(SCROLLINFO); - ScrollInfo.fMask = SIF_RANGE; - Result = NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo); - *MinPos = Result ? ScrollInfo.nMin : 0; - *MaxPos = Result ? ScrollInfo.nMax : 0; - - return Result; } /* USER32 INTERNAL FUNCTIONS **************************************************/ @@ -1199,13 +1114,13 @@ UINT XOffset = 0, YOffset = 0; if (SBType != SB_CTL) - { // Replace HAX for CMD mouse tracking. + { // Used with CMD mouse tracking. PWND pwnd = ValidateHwnd(Wnd); if (!pwnd) return; XOffset = pwnd->rcClient.left - pwnd->rcWindow.left; YOffset = pwnd->rcClient.top - pwnd->rcWindow.top; // RECT rect; -// GetClientRect(Wnd, &rect); +// WIN_GetRectangles( Wnd, COORDS_CLIENT, &rect, NULL ); ScreenToClient(Wnd, &Pt); // Pt.x -= rect.left; // Pt.y -= rect.top; @@ -1241,6 +1156,15 @@ } +static DWORD FASTCALL +IntSetScrollInfo(HWND Wnd, LPCSCROLLINFO Info, BOOL bRedraw) +{ + DWORD Ret = NtUserSetScrollInfo(Wnd, SB_CTL, Info, bRedraw); + if (Ret) IntNotifyWinEvent(EVENT_OBJECT_VALUECHANGE, Wnd, OBJID_CLIENT, CHILDID_SELF, WEF_SETBYWNDPTI); + return Ret; +} + + /*********************************************************************** * ScrollBarWndProc */ @@ -1249,12 +1173,21 @@ { #ifdef __REACTOS__ // Do this now, remove after Server side is fixed. PWND pWnd; + PSBWND pSBWnd; + SCROLLINFO ScrollInfo; pWnd = ValidateHwnd(Wnd); if (pWnd) { if (!pWnd->fnid) { + ERR("ScrollBar CTL size %d\n",(sizeof(SBWND)-sizeof(WND))); + if ( pWnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) + { + ERR("Wrong Extra bytes for Scrollbar!\n"); + return 0; + } + if (Msg != WM_CREATE) { return DefWindowProc(Wnd, Msg, wParam, lParam); @@ -1277,6 +1210,9 @@ return 0; } + // Must be a scroll bar control! + pSBWnd = (PSBWND)pWnd; + switch (Msg) { case WM_CREATE: @@ -1285,17 +1221,8 @@ case WM_ENABLE: { - PWND pWnd = ValidateHwnd(Wnd); - if (pWnd->pSBInfo) - { - ERR("ScrollBarWndProc WM_ENABLE\n"); - //NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); - NtUserMessageCall( Wnd, Msg, wParam, lParam, 0, FNID_SCROLLBAR, !unicode); - /* Refresh Scrollbars. */ - SCROLL_RefreshScrollBar(Wnd, SB_CTL, TRUE, TRUE); - } - } - return 0; + return SendMessageW( Wnd, SBM_ENABLE_ARROWS, wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH, 0); + } case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: @@ -1408,35 +1335,49 @@ } break; - case SBM_SETPOS: - return SetScrollPos(Wnd, SB_CTL, wParam, (BOOL) lParam); - case SBM_GETPOS: - return IntScrollGetScrollPos(Wnd, SB_CTL); - - case SBM_SETRANGEREDRAW: - case SBM_SETRANGE: - { - INT OldPos = IntScrollGetScrollPos(Wnd, SB_CTL); - SetScrollRange(Wnd, SB_CTL, wParam, lParam, FALSE); - if (Msg == SBM_SETRANGEREDRAW) - SCROLL_RefreshScrollBar( Wnd, SB_CTL, TRUE, TRUE ); - if (OldPos != IntScrollGetScrollPos(Wnd, SB_CTL)) return OldPos; - } + return pSBWnd->SBCalc.pos; + + case SBM_GETRANGE: + *(LPINT)wParam = pSBWnd->SBCalc.posMin; + *(LPINT)lParam = pSBWnd->SBCalc.posMax; + // This message does not return a value. return 0; - - case SBM_GETRANGE: - return IntScrollGetScrollRange(Wnd, SB_CTL, (LPINT) wParam, (LPINT) lParam); case SBM_ENABLE_ARROWS: return EnableScrollBar( Wnd, SB_CTL, wParam ); + case SBM_SETPOS: + { + ScrollInfo.cbSize = sizeof(SCROLLINFO); + ScrollInfo.fMask = SIF_POS|SIF_PREVIOUSPOS; + ScrollInfo.nPos = wParam; + return IntSetScrollInfo(Wnd, &ScrollInfo, lParam); + } + + case SBM_SETRANGEREDRAW: + case SBM_SETRANGE: + { + ScrollInfo.cbSize = sizeof(SCROLLINFO); + ScrollInfo.fMask = SIF_RANGE|SIF_PREVIOUSPOS; + ScrollInfo.nMin = wParam; + ScrollInfo.nMax = lParam; + return IntSetScrollInfo(Wnd, &ScrollInfo, Msg == SBM_SETRANGEREDRAW ? TRUE : FALSE); + } + case SBM_SETSCROLLINFO: - return NtUserSetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam, wParam); + return IntSetScrollInfo(Wnd, (LPCSCROLLINFO)lParam, wParam); case SBM_GETSCROLLINFO: - return NtUserSBGetParms(Wnd, SB_CTL, NULL, (SCROLLINFO *) lParam); - + { + PSBDATA pSBData = (PSBDATA)&pSBWnd->SBCalc; + DWORD ret = NtUserSBGetParms(Wnd, SB_CTL, pSBData, (SCROLLINFO *) lParam); + if (!ret) + { + ERR("SBM_GETSCROLLINFO No ScrollInfo\n"); + } + return ret; + } case SBM_GETSCROLLBARINFO: ((PSCROLLBARINFO)lParam)->cbSize = sizeof(SCROLLBARINFO); return NtUserGetScrollBarInfo(Wnd, OBJID_CLIENT, (PSCROLLBARINFO)lParam); @@ -1496,8 +1437,7 @@ if (!Hook) { Ret = NtUserEnableScrollBar(hwnd, nBar, flags); - if (GetLastError() == ERROR_INVALID_PARAMETER) return Ret; - if (nBar == SB_CTL) return Ret; + if (!Ret) return Ret; SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); return Ret; } @@ -1519,7 +1459,7 @@ RealGetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) { PWND pWnd; - PSBDATA pSBData = NULL; + PSBDATA pSBData; if (SB_CTL == SBType) { @@ -1534,7 +1474,12 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - // FIXME add support to set pSBData from pWnd->pSBInfo + if (!pWnd->pSBInfo) + { + SetLastError(ERROR_NO_SCROLLBARS); + return FALSE; + } + pSBData = IntGetSBData(pWnd, SBType); return NtUserSBGetParms(Wnd, SBType, pSBData, Info); } @@ -1573,17 +1518,33 @@ INT WINAPI GetScrollPos(HWND Wnd, INT Bar) { + PWND pwnd; + PSBDATA pSBData; + TRACE("Wnd=%p Bar=%d\n", Wnd, Bar); /* Refer SB_CTL requests to the window */ if (SB_CTL == Bar) - { + { return SendMessageW(Wnd, SBM_GETPOS, (WPARAM) 0, (LPARAM) 0); - } - else - { - return IntScrollGetScrollPos(Wnd, Bar); - } + } + else if (Bar == SB_HORZ || Bar == SB_VERT ) + { + pwnd = ValidateHwnd(Wnd); + if (!pwnd) return 0; + + if (pwnd->pSBInfo) + { + pSBData = IntGetSBData(pwnd, Bar); + return pSBData->pos; + } + + SetLastError(ERROR_NO_SCROLLBARS); + ERR("GetScrollPos No Scroll Info\n"); + return 0; + } + SetLastError(ERROR_INVALID_PARAMETER); + return 0; } /* @@ -1592,17 +1553,37 @@ BOOL WINAPI GetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos) { + PWND pwnd; + PSBDATA pSBData; + TRACE("Wnd=%x Bar=%d Min=%p Max=%p\n", Wnd, Bar, MinPos, MaxPos); /* Refer SB_CTL requests to the window */ if (SB_CTL == Bar) - { + { return SendMessageW(Wnd, SBM_GETRANGE, (WPARAM) MinPos, (LPARAM) MaxPos); - } - else - { - return IntScrollGetScrollRange(Wnd, Bar, MinPos, MaxPos); - } + } + else if (Bar == SB_HORZ || Bar == SB_VERT ) + { + pwnd = ValidateHwnd(Wnd); + if (!pwnd) return FALSE; + + if (pwnd->pSBInfo) + { + pSBData = IntGetSBData(pwnd, Bar); + *MinPos = pSBData->posMin; + *MaxPos = pSBData->posMax; + } + else + { + SetLastError(ERROR_NO_SCROLLBARS); + *MinPos = 0; + *MaxPos = 0; + } + return TRUE; + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } INT WINAPI @@ -1655,32 +1636,13 @@ INT WINAPI SetScrollPos(HWND hWnd, INT nBar, INT nPos, BOOL bRedraw) { - PWND pWnd; - INT Result = 0; SCROLLINFO ScrollInfo; - pWnd = ValidateHwnd(hWnd); - if ( !pWnd || !pWnd->pSBInfo ) return 0; - ScrollInfo.cbSize = sizeof(SCROLLINFO); - ScrollInfo.fMask = SIF_POS; - - /* - * Call NtUserSBGetParms() to get the previous position that - * we will later return. - */ - if (NtUserSBGetParms(hWnd, nBar, NULL, &ScrollInfo)) - { - Result = ScrollInfo.nPos; - if (Result != nPos) - { - ScrollInfo.nPos = nPos; - /* Finally set the new position */ - NtUserSetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); - } - } - - return Result; + ScrollInfo.fMask = SIF_POS|SIF_PREVIOUSPOS; + ScrollInfo.nPos = nPos; + + return RealSetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); } /* @@ -1706,6 +1668,5 @@ ScrollInfo.nMin = nMinPos; ScrollInfo.nMax = nMaxPos; SetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); // do not bypass themes. - return TRUE; }

1 0

[fireball] 57090: [ADVAPI32] - Cleanup and update source code header.
by fireball＠svn.reactos.org 17 Aug '12

17 Aug '12

Author: fireball Date: Fri Aug 17 12:47:29 2012 New Revision: 57090 URL: http://svn.reactos.org/svn/reactos?rev=57090&view=rev Log: [ADVAPI32] - Cleanup and update source code header. Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Fri Aug 17 12:47:29 2012 @@ -1,13 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/advapi32/misc/shutdown.c + * FILE: dll/win32/advapi32/misc/shutdown.c * PURPOSE: System shutdown functions - * PROGRAMMER: Emanuele Aliberti - * UPDATE HISTORY: - * 19990413 EA created - * 19990515 EA + * PROGRAMMER: Lee Schroeder <spaceseel at gmail dot com> + * Emanuele Aliberti */ #include <advapi32.h>

1 0

[fireball] 57089: [ADVAPI32] Patch by milawynsrealm: * Implemented the beginnings of InitiateShutdownA/W (nothing works yet, and it's not exported). * Running InitiateSystemShutdownA/W invokes Init...
by fireball＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: fireball Date: Thu Aug 16 22:14:49 2012 New Revision: 57089 URL: http://svn.reactos.org/svn/reactos?rev=57089&view=rev Log: [ADVAPI32] Patch by milawynsrealm: * Implemented the beginnings of InitiateShutdownA/W (nothing works yet, and it's not exported). * Running InitiateSystemShutdownA/W invokes InitiateSystemShutdownExA/W while using "Other (Planned)" as the reason code. - The "Other (Planned)" reason code seemed to be the best default option so far. Let me know if you feel otherwise. * Added the shutdown flags that are used for InitiateShutdownA/W inside of winreg.h. * Include the reason.h header inside the winreg.h header so that the reason codes can be properly called. This conforms to the VC2010 method of adding this support. * Added the declarations for InitiateSystemShutdownExA/W and InitiateShutdownA/W inside of winreg.h. * In winuser.h, change the definitions for EWX_* to conform to MSDN documentation - http://msdn.microsoft.com/en-us/library/windows/desktop/aa376868%28v=vs.85%… * Added definition support for EWX_HYBRID_SHUTDOWN which is found in Windows 8. * Calling InitiateSystemShutdownExA will convert strings to UNICODE and send it over to InitiateSystemShutdownExW. The same is also for InitiateShutdownA. See issue #7245 for more details. Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c trunk/reactos/include/psdk/winreg.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Thu Aug 16 22:14:49 2012 @@ -55,11 +55,10 @@ return rv; } - /********************************************************************** * InitiateSystemShutdownW * - * @unimplemented + * @implemented */ BOOL WINAPI InitiateSystemShutdownW(LPWSTR lpMachineName, @@ -68,30 +67,20 @@ BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - SHUTDOWN_ACTION Action = ShutdownNoReboot; - NTSTATUS Status; - - if (lpMachineName) - { - /* FIXME: remote machine shutdown not supported yet */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - - if (dwTimeout) - { - } - - Status = NtShutdownSystem(Action); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; -} - + return InitiateSystemShutdownExW(lpMachineName, + lpMessage, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + SHTDN_REASON_MAJOR_OTHER | + SHTDN_REASON_MINOR_OTHER | + SHTDN_REASON_FLAG_PLANNED); +} /********************************************************************** * InitiateSystemShutdownA * - * @unimplemented + * @implemented */ BOOL WINAPI @@ -101,68 +90,20 @@ BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - ANSI_STRING MachineNameA; - ANSI_STRING MessageA; - UNICODE_STRING MachineNameW; - UNICODE_STRING MessageW; - NTSTATUS Status; - INT LastError; - BOOL rv; - - MachineNameW.Buffer = NULL; - MessageW.Buffer = NULL; - - if (lpMachineName) - { - RtlInitAnsiString(&MachineNameA, lpMachineName); - Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); - if (STATUS_SUCCESS != Status) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - if (lpMessage) - { - RtlInitAnsiString(&MessageA, lpMessage); - Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); - if (STATUS_SUCCESS != Status) - { - if (MachineNameW.Buffer) - { - RtlFreeUnicodeString(&MachineNameW); - } - - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - rv = InitiateSystemShutdownW(MachineNameW.Buffer, - MessageW.Buffer, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown); - LastError = GetLastError(); - if (lpMachineName) - { - RtlFreeUnicodeString(&MachineNameW); - } - - if (lpMessage) - { - RtlFreeUnicodeString(&MessageW); - } - - SetLastError(LastError); - return rv; + return InitiateSystemShutdownExA(lpMachineName, + lpMessage, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + SHTDN_REASON_MAJOR_OTHER | + SHTDN_REASON_MINOR_OTHER | + SHTDN_REASON_FLAG_PLANNED); } /****************************************************************************** * InitiateSystemShutdownExW [ADVAPI32.@] * - * see InitiateSystemShutdownExA + * @unimplemented */ BOOL WINAPI InitiateSystemShutdownExW(LPWSTR lpMachineName, @@ -172,10 +113,30 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - UNIMPLEMENTED; - return TRUE; -} - + SHUTDOWN_ACTION Action = ShutdownNoReboot; + NTSTATUS Status; + + if (lpMachineName) + { + /* FIXME: remote machine shutdown not supported yet */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (dwTimeout) + { + } + + Status = NtShutdownSystem(Action); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; +} + +/****************************************************************************** + * InitiateSystemShutdownExA [ADVAPI32.@] + * + * see InitiateSystemShutdownExW + */ BOOL WINAPI InitiateSystemShutdownExA(LPSTR lpMachineName, LPSTR lpMessage, @@ -184,8 +145,139 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - UNIMPLEMENTED; - return TRUE; + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + INT LastError; + BOOL rv; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + rv = InitiateSystemShutdownExW(MachineNameW.Buffer, + MessageW.Buffer, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); + LastError = GetLastError(); + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + SetLastError(LastError); + return rv; +} + +/****************************************************************************** + * InitiateShutdownW [ADVAPI32.@] + * + * @unimplamented + */ +DWORD WINAPI +InitiateShutdownW(LPWSTR lpMachineName, + LPWSTR lpMessage, + DWORD dwGracePeriod, + DWORD dwShutdownFlags, + DWORD dwReason) +{ + UNIMPLEMENTED; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * InitiateShutdownA [ADVAPI32.@] + * + * @unimplamented + */ +DWORD WINAPI +InitiateShutdownA(LPSTR lpMachineName, + LPSTR lpMessage, + DWORD dwGracePeriod, + DWORD dwShutdownFlags, + DWORD dwReason) +{ + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + INT LastError; + DWORD rv; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + rv = InitiateShutdownW(MachineNameW.Buffer, + MessageW.Buffer, + dwGracePeriod, + dwShutdownFlags, + dwReason); + LastError = GetLastError(); + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + SetLastError(LastError); + return rv; } /* EOF */ Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Thu Aug 16 22:14:49 2012 @@ -1,9 +1,12 @@ -#ifndef _WINREG_ -#define _WINREG_ +#ifndef _WINREG_H +#define _WINREG_H #ifdef __cplusplus extern "C" { #endif + +#include <reason.h> + #define HKEY_CLASSES_ROOT ((HKEY)0x80000000) #define HKEY_CURRENT_USER ((HKEY)0x80000001) #define HKEY_LOCAL_MACHINE ((HKEY)0x80000002) @@ -34,6 +37,16 @@ #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 +/* Shutdown flags for InitiateShutdownA/W */ +#define SHUTDOWN_FORCE_OTHERS 0x00000001 +#define SHUTDOWN_FORCE_SELF 0x00000002 +#define SHUTDOWN_GRACE_OVERRIDE 0x00000020 +#define SHUTDOWN_INSTALL_UPDATES 0x00000040 +#define SHUTDOWN_NOREBOOT 0x00000010 +#define SHUTDOWN_POWEROFF 0x00000008 +#define SHUTDOWN_RESTART 0x00000004 +#define SHUTDOWN_RESTARTAPPS 0x00000080 + #define RRF_RT_REG_NONE (1 << 0) #define RRF_RT_REG_SZ (1 << 1) #define RRF_RT_REG_EXPAND_SZ (1 << 2) @@ -64,8 +77,14 @@ } VALENTW,*PVALENTW; BOOL WINAPI AbortSystemShutdownA(LPCSTR); BOOL WINAPI AbortSystemShutdownW(LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) +DWORD WINAPI InitiateShutdownA(LPSTR, LPSTR, DWORD, DWORD, DWORD); +DWORD WINAPI InitiateShutdownW(LPWSTR, LPWSTR, DWORD, DWORD, DWORD); +#endif BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); +BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); +BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); LONG WINAPI RegCloseKey(HKEY); LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); @@ -158,8 +177,10 @@ typedef VALENTW VALENT,*PVALENT; #define AbortSystemShutdown AbortSystemShutdownW #define InitiateSystemShutdown InitiateSystemShutdownW +#define InitiateSystemShutdownEx InitiateSystemShutdownExW #define RegConnectRegistry RegConnectRegistryW #if (_WIN32_WINNT >= 0x0600) +#define InitiateShutdown InitiateShutdownW #define RegCopyTree RegCopyTreeW #endif #define RegCreateKey RegCreateKeyW @@ -201,8 +222,10 @@ typedef VALENTA VALENT,*PVALENT; #define AbortSystemShutdown AbortSystemShutdownA #define InitiateSystemShutdown InitiateSystemShutdownA +#define InitiateSystemShutdownEx InitiateSystemShutdownExA #define RegConnectRegistry RegConnectRegistryA #if (_WIN32_WINNT >= 0x0600) +#define InitiateShutdown InitiateShutdownA #define RegCopyTree RegCopyTreeA #endif #define RegCreateKey RegCreateKeyA Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Thu Aug 16 22:14:49 2012 @@ -613,13 +613,16 @@ #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 #define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 #endif -#define EWX_FORCE 4 +#define EWX_FORCE 0x00000004 #define EWX_LOGOFF 0 -#define EWX_POWEROFF 8 -#define EWX_REBOOT 2 -#define EWX_SHUTDOWN 1 +#define EWX_POWEROFF 0x00000008 +#define EWX_REBOOT 0x00000002 +#define EWX_SHUTDOWN 0x00000001 #if (_WIN32_WINNT >= 0x0500) -#define EWX_FORCEIFHUNG 16 +#define EWX_FORCEIFHUNG 0x00000010 +#endif +#if (_WIN32_WINNT > 0x06010000) +#define EWX_HYBRID_SHUTDOWN 0x00400000 #endif #define CS_BYTEALIGNCLIENT 4096 #define CS_BYTEALIGNWINDOW 8192

1 0

[jimtabor] 57088: [User32] - Patch by Alex Henrie : Correct dialog focus behavior. See wine bug http://bugs.winehq.org/show_bug.cgi?id=31386 and I hope someone noticed.
by jimtabor＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: jimtabor Date: Thu Aug 16 21:59:50 2012 New Revision: 57088 URL: http://svn.reactos.org/svn/reactos?rev=57088&view=rev Log: [User32] - Patch by Alex Henrie : Correct dialog focus behavior. See wine bug http://bugs.winehq.org/show_bug.cgi?id=31386 and I hope someone noticed. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Thu Aug 16 21:59:50 2012 @@ -751,9 +751,9 @@ * DEFDLG_SetFocus * * Set the focus to a control of the dialog, selecting the text if - * the control is an edit dialog. - */ -static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) + * the control is an edit dialog that has DLGC_HASSETSEL. + */ +static void DEFDLG_SetFocus( HWND hwndCtrl ) { if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); @@ -779,7 +779,7 @@ /*********************************************************************** * DEFDLG_RestoreFocus */ -static void DEFDLG_RestoreFocus( HWND hwnd ) +static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) { DIALOGINFO *infoPtr; @@ -788,12 +788,19 @@ /* Don't set the focus back to controls if EndDialog is already called.*/ if (infoPtr->flags & DF_END) return; if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + if (justActivate) return; /* If no saved focus control exists, set focus to the first visible, non-disabled, WS_TABSTOP control in the dialog */ infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + /* If there are no WS_TABSTOP controls, set focus to the first visible, + non-disabled control in the dialog */ + if (!infoPtr->hwndFocus) infoPtr->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (!IsWindow( infoPtr->hwndFocus )) return; } - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + if (justActivate) + SetFocus( infoPtr->hwndFocus ); + else + DEFDLG_SetFocus( infoPtr->hwndFocus ); /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ @@ -1229,12 +1236,12 @@ dwSetFlag = wParam ? DF_DIALOGACTIVE : 0; if (hwndparent != hwnd) NtUserSetThreadState(dwSetFlag, DF_DIALOGACTIVE); } - if (wParam) DEFDLG_RestoreFocus( hwnd ); + if (wParam) DEFDLG_RestoreFocus( hwnd, TRUE ); else DEFDLG_SaveFocus( hwnd ); return 0; case WM_SETFOCUS: - DEFDLG_RestoreFocus( hwnd ); + DEFDLG_RestoreFocus( hwnd, FALSE ); return 0; case DM_SETDEFID: @@ -1259,7 +1266,7 @@ HWND hwndDest = (HWND)wParam; if (!lParam) hwndDest = GetNextDlgTabItem(hwnd, GetFocus(), wParam); - if (hwndDest) DEFDLG_SetFocus( hwnd, hwndDest ); + if (hwndDest) DEFDLG_SetFocus( hwndDest ); DEFDLG_SetDefButton( hwnd, dlgInfo, hwndDest ); } return 0;

1 0

[jimtabor] 57087: [User32|WineTest] - Patch by Alex Henrie: Correct dialog focus behavior.
by jimtabor＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: jimtabor Date: Thu Aug 16 21:53:34 2012 New Revision: 57087 URL: http://svn.reactos.org/svn/reactos?rev=57087&view=rev Log: [User32|WineTest] - Patch by Alex Henrie: Correct dialog focus behavior. Modified: trunk/rostests/winetests/user32/dialog.c Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Thu Aug 16 21:53:34 2012 @@ -829,7 +829,7 @@ return "unknown handle"; } -static void test_initial_focus(void) +static void test_focus(void) { /* Test 1: * This test intentionally returns FALSE in response to WM_INITDIALOG @@ -901,6 +901,8 @@ HRSRC hResource; HANDLE hTemplate; DLGTEMPLATE* pTemplate; + HWND hTextbox; + DWORD selectionStart = 0xdead, selectionEnd = 0xbeef; hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", RT_DIALOG); hTemplate = LoadResource(g_hinst, hResource); @@ -912,6 +914,20 @@ ok ((g_hwndInitialFocusT1 == 0), "Focus should not be set for an invisible DS_CONTROL dialog %p.\n", g_hwndInitialFocusT1); + + /* Also make sure that WM_SETFOCUS selects the textbox's text */ + hTextbox = GetDlgItem(hDlg, 200); + SendMessage(hTextbox, WM_SETTEXT, 0, (LPARAM)"Hello world"); + + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 11, "Text selection after WM_SETFOCUS is [%i, %i) expected [0, 11)\n", selectionStart, selectionEnd); + + /* but WM_ACTIVATE does not */ + SendMessage(hTextbox, EM_SETSEL, 0, 0); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + SendMessage(hTextbox, EM_GETSEL, (WPARAM)&selectionStart, (LPARAM)&selectionEnd); + ok(selectionStart == 0 && selectionEnd == 0, "Text selection after WM_ACTIVATE is [%i, %i) expected [0, 0)\n", selectionStart, selectionEnd); DestroyWindow(hDlg); } @@ -930,13 +946,25 @@ pTemplate = LockResource(hTemplate); hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); - g_hwndInitialFocusT1 = GetFocus(); + ok(hDlg != 0, "Failed to create test dialog.\n"); hLabel = GetDlgItem(hDlg, 200); - ok (hDlg != 0, "Failed to create test dialog.\n"); - - ok ((g_hwndInitialFocusT1 == hLabel), - "Focus should have been set to the first control, expected (%p) got (%p).\n", - hLabel, g_hwndInitialFocusT1); + + ok(GetFocus() == hLabel, "Focus not set to label, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + DestroyWindow(hDlg); + + /* Also check focus after WM_ACTIVATE and WM_SETFOCUS */ + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, NULL, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + hLabel = GetDlgItem(hDlg, 200); + + SetFocus(NULL); + SendMessage(hDlg, WM_ACTIVATE, WA_ACTIVE, 0); + ok(GetFocus() == NULL, "Focus set on WM_ACTIVATE, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); + + SetFocus(NULL); + SendMessage(hDlg, WM_SETFOCUS, 0, 0); + ok(GetFocus() == hLabel, "Focus not set to label on WM_SETFOCUS, focus=%p dialog=%p label=%p\n", GetFocus(), hDlg, hLabel); DestroyWindow(hDlg); } @@ -1405,7 +1433,7 @@ test_GetNextDlgItem(); test_IsDialogMessage(); test_WM_NEXTDLGCTL(); - test_initial_focus(); + test_focus(); test_GetDlgItem(); test_GetDlgItemText(); test_DialogBoxParamA();

1 0

[akhaldi] 57086: [KERNEL32] * Fix a comment and a last error value. By Hermes Belusca. See issue #7240 for more details.
by akhaldi＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: akhaldi Date: Thu Aug 16 15:39:40 2012 New Revision: 57086 URL: http://svn.reactos.org/svn/reactos?rev=57086&view=rev Log: [KERNEL32] * Fix a comment and a last error value. By Hermes Belusca. See issue #7240 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Aug 16 15:39:40 2012 @@ -2976,7 +2976,11 @@ IMAGE_SUBSYSTEM_WINDOWS_CUI != SectionImageInfo.SubSystemType) { DPRINT1("Invalid subsystem %d\n", SectionImageInfo.SubSystemType); - SetLastError(ERROR_BAD_EXE_FORMAT); + /* + * Despite the name of the error code suggests, it corresponds to the + * well-known "The %1 application cannot be run in Win32 mode" message. + */ + SetLastError(ERROR_CHILD_NOT_COMPLETE); goto Cleanup; } @@ -3269,7 +3273,7 @@ if (hSection) NtClose(hSection); if (hThread) { - /* We don't know any more details then this */ + /* We don't know any more details than this */ NtTerminateProcess(hProcess, STATUS_UNSUCCESSFUL); NtClose(hThread); }

1 0

[gadamopoulos] 57085: [user32_apitest] - Deactivate Test_SimpleParameters in AttachThreadInput tests until it doesn't crash in win32k. - Add some more tests in Test_SimpleParameters that should bri...
by gadamopoulos＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: gadamopoulos Date: Thu Aug 16 08:43:43 2012 New Revision: 57085 URL: http://svn.reactos.org/svn/reactos?rev=57085&view=rev Log: [user32_apitest] - Deactivate Test_SimpleParameters in AttachThreadInput tests until it doesn't crash in win32k. - Add some more tests in Test_SimpleParameters that should bring win32k to its limits Modified: trunk/rostests/apitests/user32/AttachThreadInput.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Thu Aug 16 08:43:43 2012 @@ -328,6 +328,29 @@ ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); ok(ret==1, "expected AttachThreadInput to succeed\n"); } + + /* test detaching in thread cleanup */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[0].tid, data[1].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + + TerminateThread(data[1].hThread, 0); + + ret = AttachThreadInput( data[0].tid, data[1].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + ret = AttachThreadInput( data[1].tid, data[2].tid, FALSE); + ok(ret==0, "expected AttachThreadInput to fail\n"); + + /* Create Thread1 again */ + CreateTestThread(1, NULL); + } + } void Test_Focus() //Focus Active Capture Foreground Capture @@ -634,8 +657,9 @@ if(!InitThreads()) return; - Test_SimpleParameters(); - cleanup_attachments(); + win_skip("skip Test_SimpleParameters that crash ros\n"); + //Test_SimpleParameters(); + //cleanup_attachments(); Test_Focus(); cleanup_attachments(); Test_UnaffectedMessages();

1 0

[gadamopoulos] 57084: [user32] - change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr
by gadamopoulos＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: gadamopoulos Date: Thu Aug 16 07:54:40 2012 New Revision: 57084 URL: http://svn.reactos.org/svn/reactos?rev=57084&view=rev Log: [user32] - change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Aug 16 07:54:40 2012 @@ -1262,7 +1262,7 @@ ULONG_PTR LowLimit; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Hit = 0, Data = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1326,7 +1326,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 1; + ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); } _SEH2_END; @@ -1375,7 +1375,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 2; + ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); } _SEH2_END; @@ -1397,18 +1397,6 @@ Exit: if (Hook) EndUserApiHook(); - if (Hit) - { - switch(Hit) - { - case 1: - ERR("CallWindowProcW Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - case 2: - ERR("CallWindowProcW Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - } - } return Result; } @@ -1426,7 +1414,7 @@ ULONG_PTR LowLimit; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; LRESULT Result = 0, PreResult = 0; - DWORD Hit = 0, Data = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1480,7 +1468,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 1; + ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); } _SEH2_END; @@ -1534,7 +1522,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = 2; + ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); } _SEH2_END; @@ -1561,18 +1549,6 @@ Exit: if (Hook) EndUserApiHook(); - if (Hit) - { - switch(Hit) - { - case 1: - ERR("CallWindowProcA Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - case 2: - ERR("CallWindowProcA Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc); - break; - } - } return Result; }

1 0

[gadamopoulos] 57083: [win32k] - Do not treat the release of the windows key as a hotkey if it was used as a modifier for another hotkey that was pressed - Now if I press win+R only the Run window ...
by gadamopoulos＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: gadamopoulos Date: Thu Aug 16 07:32:49 2012 New Revision: 57083 URL: http://svn.reactos.org/svn/reactos?rev=57083&view=rev Log: [win32k] - Do not treat the release of the windows key as a hotkey if it was used as a modifier for another hotkey that was pressed - Now if I press win+R only the Run window opens Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Thu Aug 16 07:32:49 2012 @@ -25,6 +25,7 @@ HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; PHOT_KEY gphkFirst = &hkWinKey; +BOOL bWinHotkeyActive = FALSE; /* FUNCTIONS *****************************************************************/ @@ -140,40 +141,6 @@ } return NULL; -} - -/* - * SendSysCmdMsg - * - * Sends syscommand to specified window - */ -static -VOID NTAPI -SendSysCmdMsg(HWND hWnd, WPARAM Cmd, LPARAM lParam) -{ - PWND pWnd; - MSG Msg; - LARGE_INTEGER LargeTickCount; - - /* Get ptr to given window */ - pWnd = UserGetWindowObject(hWnd); - if (!pWnd) - { - WARN("Invalid window!\n"); - return; - } - - /* Prepare WM_SYSCOMMAND message */ - Msg.hwnd = hWnd; - Msg.message = WM_SYSCOMMAND; - Msg.wParam = Cmd; - Msg.lParam = lParam; - KeQueryTickCount(&LargeTickCount); - Msg.time = MsqCalculateMessageTime(&LargeTickCount); - Msg.pt = gpsi->ptCursor; - - /* Post message to window */ - MsqPostMessage(pWnd->head.pti->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); } /* @@ -206,21 +173,39 @@ /* WIN and F12 keys are hardcoded here. See: http://ivanlef0u.fr/repo/windoz/VI20051005.html */ if (pHotKey == &hkWinKey) - SendSysCmdMsg(InputWindowStation->ShellWindow, SC_TASKLIST, 0); + { + if(bWinHotkeyActive == TRUE) + { + UserPostMessage(InputWindowStation->ShellWindow, WM_SYSCOMMAND, SC_TASKLIST, 0); + bWinHotkeyActive = FALSE; + } + } else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12) { //co_ActivateDebugger(); // FIXME } else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) // FIXME: Those hotkeys doesn't depend on RegisterHotKey { - SendSysCmdMsg(pHotKey->hWnd, SC_HOTKEY, (LPARAM)pHotKey->hWnd); + UserPostMessage(pHotKey->hWnd, WM_SYSCOMMAND, SC_HOTKEY, (LPARAM)pHotKey->hWnd); } else { + /* If a hotkey with the WIN modifier was activated, do not treat the release of the WIN key as a hotkey*/ + if((pHotKey->fsModifiers & MOD_WIN) != 0) + bWinHotkeyActive = FALSE; + MsqPostHotKeyMessage(pHotKey->pThread, pHotKey->hWnd, (WPARAM)pHotKey->id, MAKELPARAM((WORD)fModifiers, wVk)); + } + } + else + { + if (pHotKey == &hkWinKey) + { + /* The user pressed the win key */ + bWinHotkeyActive = TRUE; } }

1 0

[jimtabor] 57082: [NtUser] - Prevent a crash when Tcb.Win32Thread NULL.
by jimtabor＠svn.reactos.org 16 Aug '12

16 Aug '12

Author: jimtabor Date: Thu Aug 16 02:11:11 2012 New Revision: 57082 URL: http://svn.reactos.org/svn/reactos?rev=57082&view=rev Log: [NtUser] - Prevent a crash when Tcb.Win32Thread NULL. Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -490,9 +490,9 @@ } /* Free the message queue */ - if(ptiCurrent->MessageQueue) - { - MsqDestroyMessageQueue(ptiCurrent->MessageQueue); + if (ptiCurrent->MessageQueue) + { + MsqDestroyMessageQueue(ptiCurrent); } /* Find the THREADINFO in the PROCESSINFO's list */ Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -1902,15 +1902,14 @@ } VOID FASTCALL -MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) -{ +MsqCleanupMessageQueue(PTHREADINFO pti) +{ + PUSER_MESSAGE_QUEUE MessageQueue; PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; - PTHREADINFO pti; - - pti = MessageQueue->Thread->Tcb.Win32Thread; - + + MessageQueue = pti->MessageQueue; /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->PostedMessagesListHead)) @@ -2026,7 +2025,7 @@ } // Clear it all out. - if(pti->pcti) + if (pti->pcti) { pti->pcti->fsWakeBits = 0; pti->pcti->fsChangeBits = 0; @@ -2059,7 +2058,6 @@ UserDereferenceObject(pCursor); } - } PUSER_MESSAGE_QUEUE FASTCALL @@ -2090,9 +2088,10 @@ } VOID FASTCALL -MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) +MsqDestroyMessageQueue(PTHREADINFO pti) { PDESKTOP desk; + PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; MessageQueue->QF_flags |= QF_INDESTROY; @@ -2104,7 +2103,7 @@ } /* clean it up */ - MsqCleanupMessageQueue(MessageQueue); + MsqCleanupMessageQueue(pti); if (MessageQueue->NewMessagesHandle != NULL) ZwClose(MessageQueue->NewMessagesHandle); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Thu Aug 16 02:11:11 2012 @@ -50,6 +50,7 @@ /* Reference counter, only access this variable with interlocked functions! */ LONG References; + PTHREADINFO ptiSysLock; /* Owner of the message queue */ struct _ETHREAD *Thread; /* Queue of messages sent to the queue. */ @@ -182,7 +183,7 @@ OUT MSG* pMsg); BOOLEAN FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(struct _ETHREAD *Thread); -VOID FASTCALL MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); +VOID FASTCALL MsqDestroyMessageQueue(PTHREADINFO); INIT_FUNCTION NTSTATUS NTAPI MsqInitializeImpl(VOID); BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); NTSTATUS FASTCALL

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs