user32: Fixed minimal size of child windows.

[Florian Köberle]

---
 dlls/user32/tests/win.c |    8 ++++----
 dlls/user32/winpos.c    |    6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 76043d1..27991b9 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -4848,10 +4848,10 @@ static void test_minimal_child_window_size() {
     GetWindowRect(childWindow, &rect);
     width = rect.right - rect.left;
     height = rect.bottom - rect.top;
-    todo_wine
-        ok( width == 6 && height == 6,
-            "The minimal size of child windows with the style WS_CHILD is 6x6, but the window got enlarged too %dx%d.\n",
-            width, height);
+
+    ok( width == 6 && height == 6,
+        "The minimal size of child windows with the style WS_CHILD is 6x6, but the window got enlarged too %dx%d.\n",
+        width, height);
 
     GetWindowRect(fakeChildWindow, &rect);
     width = rect.right - rect.left;
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 21e1554..79140a0 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -708,14 +708,16 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos,
 
         MinMax.ptMaxSize.x = rc.right - rc.left;
         MinMax.ptMaxSize.y = rc.bottom - rc.top;
+        MinMax.ptMinTrackSize.x = 6;
+        MinMax.ptMinTrackSize.y = 6;
     }
     else
     {
         MinMax.ptMaxSize.x = GetSystemMetrics(SM_CXSCREEN);
         MinMax.ptMaxSize.y = GetSystemMetrics(SM_CYSCREEN);
+        MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
+        MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
     }
-    MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
-    MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
     MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK);
     MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK);
 
-- 
1.5.4.3


--------------070308070703080005030305--