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

user32: Fix thick child minTrack and size.

This commit is contained in:
Florian Köberle 2009-01-24 18:06:39 +01:00 committed by Alexandre Julliard
parent ce119daf3e
commit a50deff4be
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5282,20 +5282,11 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM
} }
actualMinTrackX = minmax->ptMinTrackSize.x; actualMinTrackX = minmax->ptMinTrackSize.x;
actualMinTrackY = minmax->ptMinTrackSize.y; actualMinTrackY = minmax->ptMinTrackSize.y;
if (!(test_thick_child_style & (WS_DLGFRAME | WS_BORDER))) {
todo_wine ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY,
ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY, "expected minTrack %dx%d, actual minTrack %dx%d for %s\n",
"expected minTrack %dx%d, actual minTrack %dx%d for %s\n", expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY,
expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY, test_thick_child_name);
test_thick_child_name);
}
else
{
ok(actualMinTrackX == expectedMinTrackX && actualMinTrackY == expectedMinTrackY,
"expected minTrack %dx%d, actual minTrack %dx%d for %s\n",
expectedMinTrackX, expectedMinTrackY, actualMinTrackX, actualMinTrackY,
test_thick_child_name);
}
actualMaxTrackX = minmax->ptMaxTrackSize.x; actualMaxTrackX = minmax->ptMaxTrackSize.x;
actualMaxTrackY = minmax->ptMaxTrackSize.y; actualMaxTrackY = minmax->ptMaxTrackSize.y;
@ -5453,20 +5444,9 @@ static void test_thick_child_size(HWND parentWindow)
expectedHeight = -2 * adjustedParentRect.top; expectedHeight = -2 * adjustedParentRect.top;
} }
if (!(test_thick_child_style & (WS_DLGFRAME | WS_BORDER))) ok((childWidth == expectedWidth) && (childHeight == expectedHeight),
{ "size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n",
todo_wine test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight);
ok((childWidth == expectedWidth) && (childHeight == expectedHeight),
"size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n",
test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight);
}
else
{
ok((childWidth == expectedWidth) && (childHeight == expectedHeight),
"size of window (%s) is wrong: expected size %dx%d != actual size %dx%d\n",
test_thick_child_name, expectedWidth, expectedHeight, childWidth, childHeight);
}
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
success = DestroyWindow(childWindow); success = DestroyWindow(childWindow);

12
dlls/user32/winpos.c
View File

@ -678,8 +678,16 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos,
MinMax.ptMaxSize.x = rc.right - rc.left; MinMax.ptMaxSize.x = rc.right - rc.left;
MinMax.ptMaxSize.y = rc.bottom - rc.top; MinMax.ptMaxSize.y = rc.bottom - rc.top;
MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); if (style & (WS_DLGFRAME | WS_BORDER))
MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); {
MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
}
else
{
MinMax.ptMinTrackSize.x = -2 * rc.left;
MinMax.ptMinTrackSize.y = -2 * rc.top;
}
MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
xinc = -rc.left; xinc = -rc.left;