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

user32/tests: Fix scroll tests when theming is disabled.

This commit is contained in:
Nicolas Le Cam 2009-05-04 23:49:14 +02:00 committed by Alexandre Julliard
parent 1cfc88a500
commit ffba5470c0
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include "wine/test.h" #include "wine/test.h"
static HWND hScroll, hMainWnd; static HWND hScroll, hMainWnd;
static BOOL bThemeActive = FALSE;
static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
{ {
@ -277,11 +278,18 @@ todo_wine
/* report the windows style */ /* report the windows style */
winstyle = GetWindowLongW( hwnd, GWL_STYLE ); winstyle = GetWindowLongW( hwnd, GWL_STYLE );
/* WS_VSCROLL added to the window style */ /* WS_VSCROLL added to the window style */
todo_wine
if( !(style & WS_VSCROLL)) if( !(style & WS_VSCROLL))
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), {
"unexpected style change %8lx expected %8lx\n", if (bThemeActive || style != WS_HSCROLL)
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL),
"unexpected style change %8lx expected %8lx\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL);
else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style,
"unexpected style change %8lx expected %8x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
}
/* do the test again with H and V reversed. /* do the test again with H and V reversed.
* Start with a clean window */ * Start with a clean window */
DestroyWindow( hwnd); DestroyWindow( hwnd);
@ -308,11 +316,18 @@ todo_wine
/* report the windows style */ /* report the windows style */
winstyle = GetWindowLongW( hwnd, GWL_STYLE ); winstyle = GetWindowLongW( hwnd, GWL_STYLE );
/* WS_HSCROLL added to the window style */ /* WS_HSCROLL added to the window style */
todo_wine
if( !(style & WS_HSCROLL)) if( !(style & WS_HSCROLL))
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), {
"unexpected style change %8lx expected %8lx\n", if (bThemeActive || style != WS_VSCROLL)
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL),
"unexpected style change %8lx expected %8lx\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL);
else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style,
"unexpected style change %8lx expected %8x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
}
/* Slightly change the test to use SetScrollInfo /* Slightly change the test to use SetScrollInfo
* Start with a clean window */ * Start with a clean window */
DestroyWindow( hwnd); DestroyWindow( hwnd);
@ -369,6 +384,8 @@ todo_wine
START_TEST ( scroll ) START_TEST ( scroll )
{ {
WNDCLASSA wc; WNDCLASSA wc;
HMODULE hUxtheme;
BOOL (WINAPI * pIsThemeActive)(VOID);
wc.style = CS_HREDRAW | CS_VREDRAW; wc.style = CS_HREDRAW | CS_VREDRAW;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;
@ -396,6 +413,16 @@ START_TEST ( scroll )
scrollbar_test3(); scrollbar_test3();
scrollbar_test4(); scrollbar_test4();
/* Some test results vary depending of theming being active or not */
hUxtheme = LoadLibraryA("uxtheme.dll");
if (hUxtheme)
{
pIsThemeActive = (void*)GetProcAddress(hUxtheme, "IsThemeActive");
if (pIsThemeActive)
bThemeActive = pIsThemeActive();
FreeLibrary(hUxtheme);
}
scrollbar_test_default( 0); scrollbar_test_default( 0);
scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_HSCROLL);
scrollbar_test_default( WS_VSCROLL); scrollbar_test_default( WS_VSCROLL);