ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Make sure that passed window handle is scroll control before accessing wExtra in SCROLL_GetInternalInfo. 

Fixes memory corruption in Office 2016.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-09-20 16:48:55 +02:00 committed by Alexandre Julliard
parent d3da2400e6
commit b8ef42c9fd
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/user32/scroll.c
View File

@ -159,6 +159,7 @@ static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc )
if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->vert; if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->vert;
break; break;
case SB_CTL: case SB_CTL:
if (get_class_winproc( wndPtr->class ) == BUILTIN_WINPROC( WINPROC_SCROLLBAR ))
infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra; infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra;
break; break;
case SB_BOTH: case SB_BOTH:

21
dlls/user32/tests/scroll.c
View File

@ -114,6 +114,14 @@ static void test_EnableScrollBar(void)
ok( ret, "The scrollbar should be enabled.\n" ); ok( ret, "The scrollbar should be enabled.\n" );
ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" );
SetLastError( 0xdeadbeef );
ret = EnableScrollBar( mainwnd, SB_CTL, ESB_ENABLE_BOTH );
ok( !ret, "EnableScrollBar should fail.\n" );
todo_wine
ok( GetLastError() == ERROR_INVALID_PARAMETER
|| broken(GetLastError() == 0xdeadbeef), /* winxp */
"GetLastError() = %u\n", GetLastError() );
/* disable window, try to re-enable */ /* disable window, try to re-enable */
ret = EnableWindow( hScroll, FALSE ); ret = EnableWindow( hScroll, FALSE );
ok( !ret, "got %d\n", ret ); ok( !ret, "got %d\n", ret );
@ -170,6 +178,16 @@ static void test_SetScrollPos(void)
ret = GetScrollPos( hScroll, SB_CTL); ret = GetScrollPos( hScroll, SB_CTL);
ok( ret == 30, "The position should not be equal to zero\n"); ok( ret == 30, "The position should not be equal to zero\n");
SetLastError( 0xdeadbeef );
ret = SetScrollPos( mainwnd, SB_CTL, 30, TRUE );
ok( !ret, "The position should not be set.\n" );
ok( GetLastError() == 0xdeadbeef, "GetLastError() = %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = GetScrollPos( mainwnd, SB_CTL );
ok( !ret, "The position should be equal to zero\n");
ok( GetLastError() == 0xdeadbeef, "GetLastError() = %u\n", GetLastError() );
DestroyWindow(hScroll); DestroyWindow(hScroll);
DestroyWindow(mainwnd); DestroyWindow(mainwnd);
} }
@ -192,6 +210,9 @@ static void test_ShowScrollBar(void)
ret = ShowScrollBar( NULL, SB_CTL, TRUE ); ret = ShowScrollBar( NULL, SB_CTL, TRUE );
ok( !ret, "The ShowScrollBar() should failed.\n" ); ok( !ret, "The ShowScrollBar() should failed.\n" );
ret = ShowScrollBar( mainwnd, SB_CTL, TRUE );
ok( ret, "The ShowScrollBar() should not fail.\n" );
DestroyWindow(hScroll); DestroyWindow(hScroll);
DestroyWindow(mainwnd); DestroyWindow(mainwnd);
} }