October 2006 - Wine-commits

Alexandre Julliard : advapi32: Cast-qual warning fix.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: e852f195a07da0cceeeb08a37249de4ae474b314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e852f195a07da0cceeeb08a37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 18 14:08:13 2006 +0200 advapi32: Cast-qual warning fix. --- dlls/advapi32/registry.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 26c5ae9..74b3f77 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -73,18 +73,16 @@ static const WCHAR name_CURRENT_CONFIG[] static const WCHAR name_DYN_DATA[] = {'D','y','n','D','a','t','a',0}; -#define DECL_STR(key) { sizeof(name_##key)-sizeof(WCHAR), sizeof(name_##key), (LPWSTR)name_##key } -static UNICODE_STRING root_key_names[NB_SPECIAL_ROOT_KEYS] = +static const WCHAR *root_key_names[NB_SPECIAL_ROOT_KEYS] = { - DECL_STR(CLASSES_ROOT), - { 0, 0, NULL }, /* HKEY_CURRENT_USER is determined dynamically */ - DECL_STR(LOCAL_MACHINE), - DECL_STR(USERS), - DECL_STR(PERFORMANCE_DATA), - DECL_STR(CURRENT_CONFIG), - DECL_STR(DYN_DATA) + name_CLASSES_ROOT, + NULL, /* HKEY_CURRENT_USER is determined dynamically */ + name_LOCAL_MACHINE, + name_USERS, + name_PERFORMANCE_DATA, + name_CURRENT_CONFIG, + name_DYN_DATA }; -#undef DECL_STR /* check if value type needs string conversion (Ansi<->Unicode) */ @@ -117,13 +115,15 @@ static HKEY create_special_root_hkey( HA else { OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; attr.Length = sizeof(attr); attr.RootDirectory = 0; - attr.ObjectName = &root_key_names[idx]; + attr.ObjectName = &name; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name, root_key_names[idx] ); if (NtCreateKey( &hkey, access, &attr, 0, NULL, 0, NULL )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); }

1 0

Andrew Talbot : atl: Cast-qual warnings fix.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 90b1d7abe62140934a5c521f201eb72704026253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b1d7abe62140934a5c521f2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Oct 17 22:55:43 2006 +0100 atl: Cast-qual warnings fix. --- dlls/atl/registrar.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 0a62aad..11d266f 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -286,13 +286,15 @@ static HRESULT do_process_key(LPCOLESTR } break; case 'd': { + WCHAR *end; DWORD dw; if(*iter == '0' && iter[1] == 'x') { iter += 2; - dw = strtolW(iter, (WCHAR**)&iter, 16); + dw = strtolW(iter, &end, 16); }else { - dw = strtolW(iter, (WCHAR**)&iter, 10); + dw = strtolW(iter, &end, 10); } + iter = end; lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) {

1 0

Louis. Lenders : msvcrt: Add stub for _getmaxstdio.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: a5e6c89dcf251e9ae475ab73c75c04cc3a239992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e6c89dcf251e9ae475ab73c… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Oct 17 23:34:02 2006 +0100 msvcrt: Add stub for _getmaxstdio. --- dlls/msvcrt/file.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 98c800c..146e0f3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3080,6 +3080,15 @@ int CDECL MSVCRT_wprintf(const MSVCRT_wc } /********************************************************************* + * _getmaxstdio (MSVCRT.@) + */ +int CDECL _getmaxstdio(void) +{ + FIXME("stub, always returns 512\n"); + return 512; +} + +/********************************************************************* * __pioinfo (MSVCRT.@) * FIXME: see MSVCRT_MAX_FILES define. */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5f4b61d..6a46798 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -260,7 +260,7 @@ # extern _fileinfo @ cdecl _getdllprocaddr(long str long) @ cdecl _getdrive() @ cdecl _getdrives() kernel32.GetLogicalDrives -@ stub _getmaxstdio #() +@ cdecl _getmaxstdio() @ cdecl _getmbcp() @ cdecl _getpid() kernel32.GetCurrentProcessId @ stub _getsystime #(ptr)

1 0

Pierre d'Herbemont : x11drv: Fix a typo in x11drv. h about X11DRV_GetTextExtentExPoint.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 7d2917ced55bd68736f8f0d31c7cd148f932653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2917ced55bd68736f8f0d31… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Mon Oct 16 17:51:08 2006 +0200 x11drv: Fix a typo in x11drv.h about X11DRV_GetTextExtentExPoint. --- dlls/winex11.drv/x11drv.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 10de07c..1059e8f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -163,8 +163,8 @@ extern LONG X11DRV_GetBitmapBits( HBITMA extern BOOL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer ); extern BOOL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ); -extern BOOL X11DRV_GetTextExtentPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, - INT count, LPSIZE size ); +extern BOOL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); extern BOOL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics); extern BOOL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop );

1 0

Hans Leidekker : ntdll: Win64 printf format warning fixes.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: f7b0ba7aa74efd484be1302601b3390104c9c817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b0ba7aa74efd484be130260… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Oct 16 13:49:06 2006 +0200 ntdll: Win64 printf format warning fixes. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/atom.c | 4 ++-- dlls/ntdll/cdrom.c | 10 +++++----- dlls/ntdll/critsection.c | 4 ++-- dlls/ntdll/debugbuffer.c | 40 +++++++++++++++++++------------------- dlls/ntdll/debugtools.c | 2 +- dlls/ntdll/directory.c | 10 +++++----- dlls/ntdll/error.c | 4 ++-- dlls/ntdll/exception.c | 20 ++++++++++--------- dlls/ntdll/file.c | 46 ++++++++++++++++++++++---------------------- dlls/ntdll/handletable.c | 4 ++-- dlls/ntdll/heap.c | 40 +++++++++++++++++++------------------- dlls/ntdll/loader.c | 32 ++++++++++++++++--------------- dlls/ntdll/misc.c | 2 +- dlls/ntdll/nt.c | 38 ++++++++++++++++++------------------ dlls/ntdll/om.c | 18 +++++++++-------- dlls/ntdll/path.c | 4 ++-- dlls/ntdll/process.c | 6 +++--- dlls/ntdll/reg.c | 26 ++++++++++++------------- dlls/ntdll/relay.c | 48 ++++++++++++++++++++++++---------------------- dlls/ntdll/resource.c | 6 +++--- dlls/ntdll/rtl.c | 12 ++++++------ dlls/ntdll/rtlbitmap.c | 32 +++++++++++++++---------------- dlls/ntdll/sec.c | 30 ++++++++++++++--------------- dlls/ntdll/serial.c | 20 ++++++++++--------- dlls/ntdll/server.c | 4 ++-- dlls/ntdll/signal_i386.c | 10 +++++----- dlls/ntdll/sync.c | 16 ++++++++------- dlls/ntdll/tape.c | 34 ++++++++++++++++----------------- dlls/ntdll/threadpool.c | 2 +- dlls/ntdll/version.c | 4 ++-- dlls/ntdll/virtual.c | 28 +++++++++++++-------------- 32 files changed, 281 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b0ba7aa74efd484be13…

1 0

Alexandre Julliard : msi/tests: Make sure to delete the test data file.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 11894cc77eb547dbc092aa9ecefc0dc5da4992b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11894cc77eb547dbc092aa9ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 18 11:51:05 2006 +0200 msi/tests: Make sure to delete the test data file. --- dlls/msi/tests/db.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 534c2d5..5f5da33 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1924,6 +1924,7 @@ static void test_try_transform(void) ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); MsiCloseHandle( hdb ); + DeleteFileA("testdata.bin"); /* * Both these generate an equivilent transform,

1 0

Cihan Altinay : shdocvw: Make sure BSTR is allocated before calling sink.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 545b13a733734b46ca87589ecef9172e9cffab0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=545b13a733734b46ca87589ec… Author: Cihan Altinay <bobbyg(a)gmx.net> Date: Tue Oct 17 16:56:21 2006 +0200 shdocvw: Make sure BSTR is allocated before calling sink. --- dlls/shdocvw/dochost.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 0f6ef4e..834788f 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -49,11 +49,12 @@ static void navigate_complete(DocHost *T V_DISPATCH(params+1) = disp; V_VT(&url) = VT_BSTR; - V_BSTR(&url) = This->url; + V_BSTR(&url) = SysAllocString(This->url); call_sink(This->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + SysFreeString(V_BSTR(&url)); if(disp) IDispatch_Release(disp); }

1 0

Roderick Colenbrander : gdi32: Add missing spec file entry for wglDeleteContext.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 972592177fc6eb61ac94c6c8ce12cadff413515a URL: http://source.winehq.org/git/wine.git/?a=commit;h=972592177fc6eb61ac94c6c8c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Oct 17 18:24:21 2006 +0200 gdi32: Add missing spec file entry for wglDeleteContext. --- dlls/gdi/gdi32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index e494c72..06d8995 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -499,6 +499,7 @@ ######################################## # Wine extensions: OpenGL support # @ stdcall wglCreateContext(long) +@ stdcall wglDeleteContext(long) @ stdcall wglGetCurrentContext() @ stdcall wglGetCurrentDC() @ stdcall wglMakeCurrent(long long)

1 0

Peter Oberndorfer : winedbg: Print frame address instead of duplicated bare address in backtrace.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: 9e30761951d0cf1bca3a6f9566de4b6f7c77557f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e30761951d0cf1bca3a6f956… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Oct 17 21:10:29 2006 +0200 winedbg: Print frame address instead of duplicated bare address in backtrace. --- programs/winedbg/stack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 8a6bbd6..1a28dbc 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -285,7 +285,7 @@ static void backtrace(void) dbg_curr_thread->curr_frame + 1); stack_print_addr_and_args(dbg_curr_thread->curr_frame); dbg_printf(" ("); - print_bare_address(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_pc); + print_bare_address(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_frame); dbg_printf(")\n"); } /* reset context to current stack frame */

1 0

Dmitry Timoshkov : user: Add a test for ShowWindow(SW_MAXIMIZE) called on an invisible maximized MDI child, make it mostly pass under Wine .
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: dbd43c622f7bde8c44d5b082df247dbe6e3955d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd43c622f7bde8c44d5b082d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 16 23:23:34 2006 +0900 user: Add a test for ShowWindow(SW_MAXIMIZE) called on an invisible maximized MDI child, make it mostly pass under Wine. --- dlls/user/mdi.c | 8 +++ dlls/user/tests/msg.c | 103 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winpos.c | 4 +- 3 files changed, 110 insertions(+), 5 deletions(-) diff --git a/dlls/user/mdi.c b/dlls/user/mdi.c index bfeb2db..13da1ec 100644 --- a/dlls/user/mdi.c +++ b/dlls/user/mdi.c @@ -618,7 +618,13 @@ static LONG MDI_ChildActivate( HWND clie if( isActiveFrameWnd ) { SendMessageW( child, WM_NCACTIVATE, TRUE, 0L); - SetFocus( client ); + /* Let the client window manage focus for children, but if the focus + * is already on the client (for instance this is the 1st child) then + * SetFocus won't work. It appears that Windows sends WM_SETFOCUS + * manually in this case. + */ + if (SetFocus(client) == client) + SendMessageW( client, WM_SETFOCUS, (WPARAM)client, 0 ); } SendMessageW( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child ); diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 6714f54..027810f 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -1968,11 +1968,12 @@ static const struct message WmCreateMDIc /* Win9x: message sequence terminates here. */ { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, + { WM_SETFOCUS, sent|optional }, /* in MDI client */ { HCBT_SETFOCUS, hook }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent }, /* in MDI client */ - { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|optional }, /* in MDI client */ + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -2014,6 +2015,41 @@ static const struct message WmCreateMDIc { 0 } }; +/* CreateWindow for the 1st MDI child window, initially invisible and maximized */ +static const struct message WmCreateMDIchildInvisibleMaxSeq4[] = { + { HCBT_CREATEWND, hook }, + { WM_GETMINMAXINFO, sent }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent }, + { WM_MOVE, sent }, + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|0x8000 }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOREDRAW|SWP_NOCLIENTSIZE|0x8000 }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + /* in MDI frame */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI frame */ + { WM_NCCALCSIZE, sent|wparam, 1 }, /* MDI child */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + /* Win2k sends wparam set to + * MAKEWPARAM(WM_CREATE, MDI_FIRST_CHILD_ID + nTotalCreated), + * while Win9x doesn't bother to set child window id according to + * CLIENTCREATESTRUCT.idFirstChild + */ + { WM_PARENTNOTIFY, sent /*|wparam, WM_CREATE*/ }, /* in MDI client */ + { 0 } +}; /* WM_SYSCOMMAND/SC_CLOSE for the 2nd MDI child window, initially visible and maximized */ static const struct message WmDestroyMDIchildVisibleMaxSeq2[] = { { WM_SYSCOMMAND, sent|wparam, SC_CLOSE }, @@ -2289,6 +2325,33 @@ static const struct message WmMaximizeMD { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { 0 } }; +/* ShowWindow(SW_MAXIMIZE) for a not visible maximized MDI child window */ +static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent }, /* in MDI client */ + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_MDIACTIVATE, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { 0 } +}; /* WM_MDIMAXIMIZE for an MDI child window with invisible parent */ static const struct message WmMaximizeMDIchildInvisibleParentSeq[] = { { WM_MDIMAXIMIZE, sent }, /* in MDI client */ @@ -2906,6 +2969,42 @@ static void test_mdi_messages(void) !active_child, /* win9x */ "wrong active MDI child %p\n", active_child); flush_sequence(); + + trace("creating maximized invisible MDI child window\n"); + mdi_child2 = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_MAXIMIZE | WS_CAPTION | WS_THICKFRAME, + 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, + mdi_client, 0, GetModuleHandleA(0), NULL); + assert(mdi_child2); + ok_sequence(WmCreateMDIchildInvisibleMaxSeq4, "Create maximized invisible MDI child window", TRUE); + ok(IsZoomed(mdi_child2), "MDI child should be maximized\n"); + ok(!(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE), "MDI child should be not visible\n"); + ok(!IsWindowVisible(mdi_child2), "MDI child should be not visible\n"); + + /* Win2k: MDI client still returns a just destroyed child as active + * Win9x: MDI client returns 0 + */ + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child || /* win2k */ + !active_child, /* win9x */ + "wrong active MDI child %p\n", active_child); + flush_sequence(); + + trace("call ShowWindow(mdi_child, SW_MAXIMIZE)\n"); + ShowWindow(mdi_child2, SW_MAXIMIZE); + ok_sequence(WmMaximizeMDIchildInvisibleSeq2, "ShowWindow(SW_MAXIMIZE):invisible maximized MDI child", TRUE); + ok(IsZoomed(mdi_child2), "MDI child should be maximized\n"); + ok(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n"); + ok(IsWindowVisible(mdi_child2), "MDI child should be visible\n"); + + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); + ok(active_child == mdi_child2, "wrong active MDI child %p\n", active_child); + ok(zoomed, "wrong zoomed state %d\n", zoomed); + flush_sequence(); + + SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child2, 0); + flush_sequence(); + /* end of test for maximized MDI children */ mdi_cs.szClass = "MDI_child_Class"; diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 6f9b8f6..2f4ad51 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -938,7 +938,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT case SW_MAXIMIZE: old_style = GetWindowLongW( hwnd, GWL_STYLE ); - if ((old_style & WS_MAXIMIZE) && (old_style & WS_CHILD)) return SWP_NOSIZE | SWP_NOMOVE; + if ((old_style & WS_MAXIMIZE) && (old_style & WS_VISIBLE)) return SWP_NOSIZE | SWP_NOMOVE; WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL ); @@ -1029,7 +1029,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && (style & WS_CHILD)) return wasVisible; + if ((style & WS_MAXIMIZE) && wasVisible) return wasVisible; state_change = TRUE; break;

1 0