[PATCH 08/11] user32: Fixed max size of child with exStyle WS_EX_DGLMODALFRAME.
Florian Köberle
florian at fkoeberle.de
Tue Jan 20 06:52:40 CST 2009
---
dlls/user32/tests/win.c | 21 ++++++---------------
dlls/user32/winpos.c | 12 +-----------
2 files changed, 7 insertions(+), 26 deletions(-)
mode change 100644 => 100755 dlls/user32/winpos.c
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 605d7c5..1e94831 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -5303,21 +5303,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
old mode 100644
new mode 100755
index a9f0158..6317005
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -683,17 +683,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos,
MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
- if (exstyle & WS_EX_DLGMODALFRAME)
- {
- 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
{
--
1.5.4.3
More information about the wine-patches
mailing list