Commit 8784702d authored by Florian Köberle's avatar Florian Köberle Committed by Alexandre Julliard

user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.

parent aaddefff
...@@ -5329,21 +5329,12 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM ...@@ -5329,21 +5329,12 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
expectedMaxSizeY = rect.bottom - rect.top; expectedMaxSizeY = rect.bottom - rect.top;
actualMaxSizeX = minmax->ptMaxSize.x; actualMaxSizeX = minmax->ptMaxSize.x;
actualMaxSizeY = minmax->ptMaxSize.y; actualMaxSizeY = minmax->ptMaxSize.y;
if (test_thick_child_exStyle & WS_EX_DLGMODALFRAME)
{ ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY,
todo_wine "expected maxSize %dx%d, actual maxSize %dx%d for %s\n",
ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY,
"expected maxSize %dx%d, actual maxSize %dx%d for %s\n", test_thick_child_name);
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);
}
expectedPosX = - getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle); expectedPosX = - getExpectedBorderSize(test_thick_child_style, test_thick_child_exStyle);
expectedPosY = expectedPosX; expectedPosY = expectedPosX;
......
...@@ -686,17 +686,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, ...@@ -686,17 +686,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos,
MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
if (HAS_DLGFRAME( style, exstyle )) xinc = yinc = 0;
{
xinc = GetSystemMetrics(SM_CXDLGFRAME);
yinc = GetSystemMetrics(SM_CYDLGFRAME);
}
else
{
xinc = yinc = 0;
}
MinMax.ptMaxSize.x += 2 * xinc;
MinMax.ptMaxSize.y += 2 * yinc;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment