Skip to content

W
wine-winehq
Commit 6cf348d7 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

In SetWindowPos if changing Z order and child window not yet in its

parent list, do not link it in WINPOS_ShowIconTitle, check for retval of WIN_FindWndPtr.
parent d1bb7f71
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
windows/winpos.c
View file @ 6cf348d7
......@@ -1050,15 +1050,16 @@ BOOL WINPOS_ShowIconTitle( WND* pWnd, BOOL bShow )
lpPos->hwndIconTitle = hWnd = ICONTITLE_Create( pWnd );
if( bShow )
{
pWnd = WIN_FindWndPtr(hWnd);
if( !(pWnd->dwStyle & WS_VISIBLE) )
if( ( pWnd = WIN_FindWndPtr(hWnd) ) != NULL)
{
SendMessageA( hWnd, WM_SHOWWINDOW, TRUE, 0 );
SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW );
if( !(pWnd->dwStyle & WS_VISIBLE) )
{
SendMessageA( hWnd, WM_SHOWWINDOW, TRUE, 0 );
SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW );
}
WIN_ReleaseWndPtr(pWnd);
}
WIN_ReleaseWndPtr(pWnd);
}
else ShowWindow( hWnd, SW_HIDE );
}
......@@ -2562,8 +2563,8 @@ Pos: /* -----------------------------------------------------------------------
if(!(winpos.flags & SWP_NOZORDER))
{
WIN_UnlinkWindow( winpos.hwnd );
WIN_LinkWindow( winpos.hwnd, hwndInsertAfter );
if ( WIN_UnlinkWindow( winpos.hwnd ) )
WIN_LinkWindow( winpos.hwnd, hwndInsertAfter );
}
/* Reset active DCEs */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment