win32ss/user/user32/controls/edit.c | 8 ++++++++ dll/win32/comctl32/edit.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 70bdd1d40d..d18357a946 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1692,7 +1692,11 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) */ static void EDIT_UpdateScrollInfo(EDITSTATE *es) { +#ifdef __REACTOS__ + if (es->style & WS_VSCROLL) +#else if ((es->style & WS_VSCROLL) && !(es->flags & EF_VSCROLL_TRACK)) +#endif { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); @@ -1706,7 +1710,11 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) SetScrollInfo(es->hwndSelf, SB_VERT, &si, TRUE); } +#ifdef __REACTOS__ + if (es->style & WS_HSCROLL) +#else if ((es->style & WS_HSCROLL) && !(es->flags & EF_HSCROLL_TRACK)) +#endif { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index e2f47d008e..5c5bf8f252 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -1543,7 +1543,11 @@ static BOOL EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) */ static void EDIT_UpdateScrollInfo(EDITSTATE *es) { +#ifdef __REACTOS__ + if (es->style & WS_VSCROLL) +#else if ((es->style & WS_VSCROLL) && !(es->flags & EF_VSCROLL_TRACK)) +#endif { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO); @@ -1557,7 +1561,11 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) SetScrollInfo(es->hwndSelf, SB_VERT, &si, TRUE); } +#ifdef __REACTOS__ + if (es->style & WS_HSCROLL) +#else if ((es->style & WS_HSCROLL) && !(es->flags & EF_HSCROLL_TRACK)) +#endif { SCROLLINFO si; si.cbSize = sizeof(SCROLLINFO);