Florian Köberle : user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.
Alexandre Julliard
julliard at winehq.org
Fri Jan 23 10:07:00 CST 2009
Module: wine
Branch: master
Commit: 8784702d1f3a2be9d37dd300593add4df907323f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8784702d1f3a2be9d37dd300593add4df907323f
Author: Florian Köberle <florian at fkoeberle.de>
Date: Tue Jan 20 13:52:40 2009 +0100
user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.
---
dlls/user32/tests/win.c | 21 ++++++---------------
dlls/user32/winpos.c | 12 +-----------
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index d2e9bc6..c49b65f 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -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;
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 54eb34b..4be6a62 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -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
{
More information about the wine-cvs
mailing list