From 7a4d47a61f601b09ef737ed54774f685133ef46d Mon Sep 17 00:00:00 2001 From: James Tabor Date: Sun, 13 May 2012 07:15:53 +0000 Subject: [PATCH] - Fix wine Win test_dialog_styles tests and todos. svn path=/trunk/; revision=56571 --- reactos/win32ss/user/user32/windows/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/win32ss/user/user32/windows/dialog.c b/reactos/win32ss/user/user32/windows/dialog.c index 54d6a073fe6..8285ccf5caa 100644 --- a/reactos/win32ss/user/user32/windows/dialog.c +++ b/reactos/win32ss/user/user32/windows/dialog.c @@ -885,11 +885,13 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, rect.left = rect.top = 0; rect.right = MulDiv(template.cx, xBaseUnit, 4); rect.bottom = MulDiv(template.cy, yBaseUnit, 8); - if (template.style & WS_CHILD) + + if (template.style & DS_CONTROL) template.style &= ~(WS_CAPTION|WS_SYSMENU); + template.style |= DS_3DLOOK; if (template.style & DS_MODALFRAME) template.exStyle |= WS_EX_DLGMODALFRAME; - if (template.style & DS_CONTROL) + if ((template.style & DS_CONTROL) || !(template.style & WS_CHILD)) template.exStyle |= WS_EX_CONTROLPARENT; AdjustWindowRectEx( &rect, template.style, (hMenu != 0), template.exStyle ); pos.x = rect.left;