marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.

oldstable
Florian Köberle 2009-01-20 13:52:40 +01:00 committed by Alexandre Julliard
parent aaddefff53
commit 8784702d1f
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5329,21 +5329,12 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
expectedMaxSizeY = rect.bottom - rect.top;
actualMaxSizeX = minmax->ptMaxSize.x;
actualMaxSizeY = minmax->ptMaxSize.y;
if (test_thick_child_exStyle & WS_EX_DLGMODALFRAME)
{
todo_wine
ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY,
"expected maxSize %dx%d, actual maxSize %dx%d for %s\n",
expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY,
test_thick_child_name);
}
else
{
ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY,
"expected maxSize %dx%d, actual maxSize %dx%d for %s\n",
expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY,
test_thick_child_name);
}
ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY,
"expected maxSize %dx%d, actual maxSize %dx%d for %s\n",
expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY,
test_thick_child_name);
expectedPosX = - getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle);
expectedPosY = expectedPosX;

12
dlls/user32/winpos.c
View File

@ -686,17 +686,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos,
MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
if (HAS_DLGFRAME( style, exstyle ))
{
xinc = GetSystemMetrics(SM_CXDLGFRAME);
yinc = GetSystemMetrics(SM_CYDLGFRAME);
}
else
{
xinc = yinc = 0;
}
MinMax.ptMaxSize.x += 2 * xinc;
MinMax.ptMaxSize.y += 2 * yinc;
xinc = yinc = 0;
}
else
{