ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added WIN_ListParents function and renamed WIN_BuildWinArray into 

WIN_ListChildren. Made owner field in WND structure an HWND.
This commit is contained in:
Alexandre Julliard 2001-08-24 19:28:21 +00:00
parent 41d6a96a60
commit 9d9dac0947
10 changed files with 195 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls/icontitle.c
View File

@ -58,12 +58,10 @@ HWND ICONTITLE_Create( HWND owner )
wndPtr = WIN_FindWndPtr( hWnd ); wndPtr = WIN_FindWndPtr( hWnd );
if( wndPtr ) if( wndPtr )
{ {
WND *wnd = WIN_FindWndPtr(owner); wndPtr->owner = owner; /* MDI depends on this */
wndPtr->owner = wnd; /* MDI depends on this */
wndPtr->dwStyle &= ~(WS_CAPTION | WS_BORDER); wndPtr->dwStyle &= ~(WS_CAPTION | WS_BORDER);
if (!IsWindowEnabled(owner)) wndPtr->dwStyle |= WS_DISABLED; if (!IsWindowEnabled(owner)) wndPtr->dwStyle |= WS_DISABLED;
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
WIN_ReleaseWndPtr(wnd);
return hWnd; return hWnd;
} }
return 0; return 0;

6
dlls/x11drv/window.c
View File

@ -347,9 +347,9 @@ static void set_wm_hints( Display *display, WND *win )
/* transient for hint */ /* transient for hint */
if (win->owner) if (win->owner)
{ {
struct x11drv_win_data *owner_data = win->owner->pDriverData; Window owner_win = X11DRV_get_whole_window( win->owner );
XSetTransientForHint( display, data->whole_window, owner_data->whole_window ); XSetTransientForHint( display, data->whole_window, owner_win );
group_leader = owner_data->whole_window; group_leader = owner_win;
} }
else group_leader = data->whole_window; else group_leader = data->whole_window;

6
dlls/x11drv/winpos.c
View File

@ -573,7 +573,7 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter)
if( hwndInsertAfter != HWND_TOP ) if( hwndInsertAfter != HWND_TOP )
{ {
if ((list = WIN_BuildWinArray( GetDesktopWindow() ))) if ((list = WIN_ListChildren( GetDesktopWindow() )))
{ {
int i; int i;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
@ -588,7 +588,7 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter)
} }
else if (style & WS_CHILD) return hwndInsertAfter; else if (style & WS_CHILD) return hwndInsertAfter;
if (!list) list = WIN_BuildWinArray( GetDesktopWindow() ); if (!list) list = WIN_ListChildren( GetDesktopWindow() );
if (list) if (list)
{ {
int i; int i;
@ -604,7 +604,7 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter)
hwndInsertAfter = list[i]; hwndInsertAfter = list[i];
} }
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
} }
return hwndInsertAfter; return hwndInsertAfter;

6
include/win.h
View File

@ -25,7 +25,7 @@ typedef struct tagWND
struct tagWND *next; /* Next sibling */ struct tagWND *next; /* Next sibling */
struct tagWND *child; /* First child */ struct tagWND *child; /* First child */
struct tagWND *parent; /* Window parent (from CreateWindow) */ struct tagWND *parent; /* Window parent (from CreateWindow) */
struct tagWND *owner; /* Window owner */ HWND owner; /* Window owner */
struct tagCLASS *class; /* Window class */ struct tagCLASS *class; /* Window class */
HWINDOWPROC winproc; /* Window procedure */ HWINDOWPROC winproc; /* Window procedure */
DWORD dwMagic; /* Magic number (must be WND_MAGIC) */ DWORD dwMagic; /* Magic number (must be WND_MAGIC) */
@ -92,8 +92,8 @@ extern HWND WIN_FindWinToRepaint( HWND hwnd );
extern void WIN_DestroyThreadWindows( HWND hwnd ); extern void WIN_DestroyThreadWindows( HWND hwnd );
extern BOOL WIN_CreateDesktopWindow(void); extern BOOL WIN_CreateDesktopWindow(void);
extern BOOL WIN_IsWindowDrawable(WND*, BOOL ); extern BOOL WIN_IsWindowDrawable(WND*, BOOL );
extern HWND *WIN_BuildWinArray( HWND hwnd ); extern HWND *WIN_ListParents( HWND hwnd );
extern void WIN_ReleaseWinArray( HWND *wndArray ); extern HWND *WIN_ListChildren( HWND hwnd );
extern BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly ); extern BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly );
extern HWND CARET_GetHwnd(void); extern HWND CARET_GetHwnd(void);

4
windows/dialog.c
View File

@ -1609,14 +1609,14 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id )
HWND WINAPI GetDlgItem( HWND hwndDlg, INT id ) HWND WINAPI GetDlgItem( HWND hwndDlg, INT id )
{ {
int i; int i;
HWND *list = WIN_BuildWinArray( hwndDlg ); HWND *list = WIN_ListChildren( hwndDlg );
HWND ret = 0; HWND ret = 0;
if (!list) return 0; if (!list) return 0;
for (i = 0; list[i]; i++) if (GetWindowLongW( list[i], GWL_ID ) == id) break; for (i = 0; list[i]; i++) if (GetWindowLongW( list[i], GWL_ID ) == id) break;
ret = list[i]; ret = list[i];
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
return ret; return ret;
} }

32
windows/mdi.c
View File

@ -141,13 +141,13 @@ static HWND MDI_GetChildByID(HWND hwnd, UINT id)
HWND *win_array; HWND *win_array;
int i; int i;
if (!(win_array = WIN_BuildWinArray( hwnd ))) return 0; if (!(win_array = WIN_ListChildren( hwnd ))) return 0;
for (i = 0; win_array[i]; i++) for (i = 0; win_array[i]; i++)
{ {
if (GetWindowLongA( win_array[i], GWL_ID ) == id) break; if (GetWindowLongA( win_array[i], GWL_ID ) == id) break;
} }
ret = win_array[i]; ret = win_array[i];
WIN_ReleaseWinArray( win_array ); HeapFree( GetProcessHeap(), 0, win_array );
return ret; return ret;
} }
@ -282,7 +282,7 @@ static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext,
dwStyleMask |= WS_DISABLED | WS_VISIBLE; dwStyleMask |= WS_DISABLED | WS_VISIBLE;
if( !hWnd ) hWnd = clientInfo->hwndActiveChild; if( !hWnd ) hWnd = clientInfo->hwndActiveChild;
if (!(list = WIN_BuildWinArray( GetParent(hWnd) ))) return 0; if (!(list = WIN_ListChildren( GetParent(hWnd) ))) return 0;
i = 0; i = 0;
/* start from next after hWnd */ /* start from next after hWnd */
while (list[i] && list[i] != hWnd) i++; while (list[i] && list[i] != hWnd) i++;
@ -304,7 +304,7 @@ static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext,
if (bNext) goto found; if (bNext) goto found;
} }
found: found:
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
return last; return last;
} }
@ -857,7 +857,7 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci )
if (ci->nActiveChildren == 0) return 0; if (ci->nActiveChildren == 0) return 0;
if (!(win_array = WIN_BuildWinArray( client ))) return 0; if (!(win_array = WIN_ListChildren( client ))) return 0;
/* remove all the windows we don't want */ /* remove all the windows we don't want */
for (i = total = 0; win_array[i]; i++) for (i = total = 0; win_array[i]; i++)
@ -890,7 +890,7 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci )
SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
} }
} }
WIN_ReleaseWinArray( win_array ); HeapFree( GetProcessHeap(), 0, win_array );
if (has_icons) ArrangeIconicWindows( client ); if (has_icons) ArrangeIconicWindows( client );
return 0; return 0;
@ -910,7 +910,7 @@ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam )
if (ci->nActiveChildren == 0) return; if (ci->nActiveChildren == 0) return;
if (!(win_array = WIN_BuildWinArray( client ))) return; if (!(win_array = WIN_ListChildren( client ))) return;
/* remove all the windows we don't want */ /* remove all the windows we don't want */
for (i = total = 0; win_array[i]; i++) for (i = total = 0; win_array[i]; i++)
@ -975,7 +975,7 @@ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam )
x += xsize; x += xsize;
} }
} }
WIN_ReleaseWinArray( win_array ); HeapFree( GetProcessHeap(), 0, win_array );
if (has_icons) ArrangeIconicWindows( client ); if (has_icons) ArrangeIconicWindows( client );
} }
@ -1948,7 +1948,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
GetClientRect( hwnd, &clientRect ); GetClientRect( hwnd, &clientRect );
SetRectEmpty( &childRect ); SetRectEmpty( &childRect );
if ((list = WIN_BuildWinArray( hwnd ))) if ((list = WIN_ListChildren( hwnd )))
{ {
int i; int i;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
@ -1956,7 +1956,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
DWORD style = GetWindowLongW( list[i], GWL_STYLE ); DWORD style = GetWindowLongW( list[i], GWL_STYLE );
if (style & WS_MAXIMIZE) if (style & WS_MAXIMIZE)
{ {
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
ShowScrollBar( hwnd, SB_BOTH, FALSE ); ShowScrollBar( hwnd, SB_BOTH, FALSE );
return; return;
} }
@ -1967,7 +1967,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
WIN_ReleaseWndPtr( pWnd ); WIN_ReleaseWndPtr( pWnd );
} }
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
} }
UnionRect( &childRect, &clientRect, &childRect ); UnionRect( &childRect, &clientRect, &childRect );
@ -2145,11 +2145,11 @@ static BOOL WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wParam,
HWND hListBox = GetDlgItem(hDlg, MDI_IDC_LISTBOX); HWND hListBox = GetDlgItem(hDlg, MDI_IDC_LISTBOX);
HWND *list, *sorted_list; HWND *list, *sorted_list;
if (!(list = WIN_BuildWinArray( (HWND)lParam ))) return TRUE; if (!(list = WIN_ListChildren( (HWND)lParam ))) return TRUE;
if (!(sorted_list = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, if (!(sorted_list = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(HWND) * ci->nActiveChildren ))) sizeof(HWND) * ci->nActiveChildren )))
{ {
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
return FALSE; return FALSE;
} }
@ -2159,7 +2159,7 @@ static BOOL WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wParam,
UINT id = GetWindowLongW( list[i], GWL_ID ) - ci->idFirstChild; UINT id = GetWindowLongW( list[i], GWL_ID ) - ci->idFirstChild;
if (id < ci->nActiveChildren) sorted_list[id] = list[i]; if (id < ci->nActiveChildren) sorted_list[id] = list[i];
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
for (i = 0; i < ci->nActiveChildren; i++) for (i = 0; i < ci->nActiveChildren; i++)
{ {
@ -2260,13 +2260,13 @@ static void MDI_SwapMenuItems(HWND parent, UINT pos1, UINT pos2)
HWND *list; HWND *list;
int i; int i;
if (!(list = WIN_BuildWinArray( parent ))) return; if (!(list = WIN_ListChildren( parent ))) return;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
{ {
UINT id = GetWindowLongW( list[i], GWL_ID ); UINT id = GetWindowLongW( list[i], GWL_ID );
if (id == pos1) SetWindowLongW( list[i], GWL_ID, pos2 ); if (id == pos1) SetWindowLongW( list[i], GWL_ID, pos2 );
else if (id == pos2) SetWindowLongW( list[i], GWL_ID, pos1 ); else if (id == pos2) SetWindowLongW( list[i], GWL_ID, pos1 );
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
} }

12
windows/painting.c
View File

@ -651,7 +651,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
if( flags & (RDW_INVALIDATE | RDW_VALIDATE) ) if( flags & (RDW_INVALIDATE | RDW_VALIDATE) )
{ {
HWND *list; HWND *list;
if( hRgn > 1 && bChildren && (list = WIN_BuildWinArray( wndPtr->hwndSelf ))) if( hRgn > 1 && bChildren && (list = WIN_ListChildren( wndPtr->hwndSelf )))
{ {
POINT ptTotal, prevOrigin = {0,0}; POINT ptTotal, prevOrigin = {0,0};
POINT ptClient; POINT ptClient;
@ -689,7 +689,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
} }
WIN_ReleaseWndPtr( wnd ); WIN_ReleaseWndPtr( wnd );
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
OffsetRgn( hRgn, ptTotal.x, ptTotal.y ); OffsetRgn( hRgn, ptTotal.x, ptTotal.y );
bChildren = 0; bChildren = 0;
} }
@ -700,7 +700,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
if( bChildren ) if( bChildren )
{ {
HWND *list; HWND *list;
if ((list = WIN_BuildWinArray( wndPtr->hwndSelf ))) if ((list = WIN_ListChildren( wndPtr->hwndSelf )))
{ {
INT i; INT i;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
@ -711,7 +711,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
RDW_UpdateRgns( wnd, hRgn, flags, FALSE ); RDW_UpdateRgns( wnd, hRgn, flags, FALSE );
WIN_ReleaseWndPtr( wnd ); WIN_ReleaseWndPtr( wnd );
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
} }
} }
@ -820,7 +820,7 @@ static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
{ {
HWND *list, *phwnd; HWND *list, *phwnd;
if( (list = WIN_BuildWinArray( wndPtr->hwndSelf )) ) if( (list = WIN_ListChildren( wndPtr->hwndSelf )) )
{ {
for (phwnd = list; *phwnd; phwnd++) for (phwnd = list; *phwnd; phwnd++)
{ {
@ -830,7 +830,7 @@ static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
hrgn = RDW_Paint( wndPtr, hrgn, flags, ex ); hrgn = RDW_Paint( wndPtr, hrgn, flags, ex );
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
} }
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
} }
} }

4
windows/user.c
View File

@ -224,7 +224,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reserved )
/* We have to build a list of all windows first, as in EnumWindows */ /* We have to build a list of all windows first, as in EnumWindows */
if (!(list = WIN_BuildWinArray( GetDesktopWindow() ))) return FALSE; if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return FALSE;
/* Send a WM_QUERYENDSESSION message to every window */ /* Send a WM_QUERYENDSESSION message to every window */
@ -243,7 +243,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reserved )
if (!IsWindow( *phwnd )) continue; if (!IsWindow( *phwnd )) continue;
SendMessageW( *phwnd, WM_ENDSESSION, result, 0 ); SendMessageW( *phwnd, WM_ENDSESSION, result, 0 );
} }
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
if (result) ExitKernel16(); if (result) ExitKernel16();
return FALSE; return FALSE;

281
windows/win.c
View File

@ -167,53 +167,6 @@ void WIN_UpdateWndPtr(WND **oldPtr, WND *newPtr)
} }
/***********************************************************************
* WIN_DumpWindow
*
* Dump the content of a window structure to stderr.
*/
void WIN_DumpWindow( HWND hwnd )
{
WND *ptr;
char className[80];
int i;
if (!(ptr = WIN_FindWndPtr( hwnd )))
{
WARN("%04x is not a window handle\n", hwnd );
return;
}
if (!GetClassNameA( hwnd, className, sizeof(className ) ))
strcpy( className, "#NULL#" );
TRACE("Window %04x (%p):\n", hwnd, ptr );
DPRINTF( "next=%p child=%p parent=%p owner=%p class=%p '%s'\n"
"inst=%04x taskQ=%04x updRgn=%04x active=%04x dce=%p idmenu=%08x\n"
"style=%08lx exstyle=%08lx wndproc=%08x text='%s'\n"
"client=%d,%d-%d,%d window=%d,%d-%d,%d"
"sysmenu=%04x flags=%04x props=%p vscroll=%p hscroll=%p\n",
ptr->next, ptr->child, ptr->parent, ptr->owner,
ptr->class, className, ptr->hInstance, ptr->hmemTaskQ,
ptr->hrgnUpdate, ptr->hwndLastActive, ptr->dce, ptr->wIDmenu,
ptr->dwStyle, ptr->dwExStyle, (UINT)ptr->winproc,
ptr->text ? debugstr_w(ptr->text) : "",
ptr->rectClient.left, ptr->rectClient.top, ptr->rectClient.right,
ptr->rectClient.bottom, ptr->rectWindow.left, ptr->rectWindow.top,
ptr->rectWindow.right, ptr->rectWindow.bottom, ptr->hSysMenu,
ptr->flags, ptr->pProp, ptr->pVScroll, ptr->pHScroll );
if (ptr->cbWndExtra)
{
DPRINTF( "extra bytes:" );
for (i = 0; i < ptr->cbWndExtra; i++)
DPRINTF( " %02x", *((BYTE*)ptr->wExtra+i) );
DPRINTF( "\n" );
}
DPRINTF( "\n" );
WIN_ReleaseWndPtr(ptr);
}
/*********************************************************************** /***********************************************************************
* WIN_UnlinkWindow * WIN_UnlinkWindow
@ -428,7 +381,7 @@ void WIN_DestroyThreadWindows( HWND hwnd )
HWND *list; HWND *list;
int i; int i;
if (!(list = WIN_BuildWinArray( hwnd ))) return; if (!(list = WIN_ListChildren( hwnd ))) return;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
{ {
if (!IsWindow( list[i] )) continue; if (!IsWindow( list[i] )) continue;
@ -437,7 +390,7 @@ void WIN_DestroyThreadWindows( HWND hwnd )
else else
WIN_DestroyThreadWindows( list[i] ); WIN_DestroyThreadWindows( list[i] );
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
} }
/*********************************************************************** /***********************************************************************
@ -470,7 +423,7 @@ BOOL WIN_CreateDesktopWindow(void)
pWndDesktop->next = NULL; pWndDesktop->next = NULL;
pWndDesktop->child = NULL; pWndDesktop->child = NULL;
pWndDesktop->parent = NULL; pWndDesktop->parent = NULL;
pWndDesktop->owner = NULL; pWndDesktop->owner = 0;
pWndDesktop->class = class; pWndDesktop->class = class;
pWndDesktop->dwMagic = WND_MAGIC; pWndDesktop->dwMagic = WND_MAGIC;
pWndDesktop->hwndSelf = hwndDesktop; pWndDesktop->hwndSelf = hwndDesktop;
@ -675,19 +628,16 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
if ((cs->style & WS_CHILD) && cs->hwndParent) if ((cs->style & WS_CHILD) && cs->hwndParent)
{ {
wndPtr->parent = WIN_FindWndPtr( cs->hwndParent ); wndPtr->parent = WIN_FindWndPtr( cs->hwndParent );
wndPtr->owner = NULL; wndPtr->owner = 0;
WIN_ReleaseWndPtr(wndPtr->parent); WIN_ReleaseWndPtr(wndPtr->parent);
} }
else else
{ {
wndPtr->parent = pWndDesktop; wndPtr->parent = pWndDesktop;
if (!cs->hwndParent || (cs->hwndParent == pWndDesktop->hwndSelf)) if (!cs->hwndParent || (cs->hwndParent == pWndDesktop->hwndSelf))
wndPtr->owner = NULL; wndPtr->owner = 0;
else else
{ wndPtr->owner = GetAncestor( cs->hwndParent, GA_ROOT );
wndPtr->owner = WIN_FindWndPtr( GetAncestor( cs->hwndParent, GA_ROOT ));
WIN_ReleaseWndPtr(wndPtr->owner);
}
} }
@ -1062,7 +1012,7 @@ static void WIN_SendDestroyMsg( HWND hwnd )
HWND* pWndArray; HWND* pWndArray;
int i; int i;
if (!(pWndArray = WIN_BuildWinArray( hwnd ))) return; if (!(pWndArray = WIN_ListChildren( hwnd ))) return;
/* start from the end (FIXME: is this needed?) */ /* start from the end (FIXME: is this needed?) */
for (i = 0; pWndArray[i]; i++) ; for (i = 0; pWndArray[i]; i++) ;
@ -1071,7 +1021,7 @@ static void WIN_SendDestroyMsg( HWND hwnd )
{ {
if (IsWindow( pWndArray[i] )) WIN_SendDestroyMsg( pWndArray[i] ); if (IsWindow( pWndArray[i] )) WIN_SendDestroyMsg( pWndArray[i] );
} }
WIN_ReleaseWinArray( pWndArray ); HeapFree( GetProcessHeap(), 0, pWndArray );
} }
else else
WARN("\tdestroyed itself while in WM_DESTROY!\n"); WARN("\tdestroyed itself while in WM_DESTROY!\n");
@ -1158,31 +1108,40 @@ BOOL WINAPI DestroyWindow( HWND hwnd )
{ {
for (;;) for (;;)
{ {
WND *siblingPtr = WIN_LockWndPtr(wndPtr->parent->child); /* First sibling */ int i, got_one = 0;
while (siblingPtr) HWND *list = WIN_ListChildren( wndPtr->parent->hwndSelf );
if (list)
{ {
if (siblingPtr->owner == wndPtr) for (i = 0; list[i]; i++)
{
WND *siblingPtr = WIN_FindWndPtr( list[i] );
if (!siblingPtr) continue;
if (siblingPtr->owner == hwnd)
{ {
if (siblingPtr->hmemTaskQ == wndPtr->hmemTaskQ) if (siblingPtr->hmemTaskQ == wndPtr->hmemTaskQ)
break;
else
siblingPtr->owner = NULL;
}
WIN_UpdateWndPtr(&siblingPtr,siblingPtr->next);
}
if (siblingPtr)
{ {
DestroyWindow( siblingPtr->hwndSelf ); WIN_ReleaseWndPtr( siblingPtr );
DestroyWindow( list[i] );
got_one = 1;
continue;
}
else siblingPtr->owner = 0;
}
WIN_ReleaseWndPtr( siblingPtr ); WIN_ReleaseWndPtr( siblingPtr );
} }
else break; HeapFree( GetProcessHeap(), 0, list );
}
if (!got_one) break;
} }
WINPOS_ActivateOtherWindow(wndPtr->hwndSelf); WINPOS_ActivateOtherWindow(wndPtr->hwndSelf);
if( wndPtr->owner && if (wndPtr->owner)
wndPtr->owner->hwndLastActive == wndPtr->hwndSelf ) {
wndPtr->owner->hwndLastActive = wndPtr->owner->hwndSelf; WND *owner = WIN_FindWndPtr( wndPtr->owner );
if (owner->hwndLastActive == hwnd) owner->hwndLastActive = wndPtr->owner;
WIN_ReleaseWndPtr( owner );
}
} }
/* Send destroy messages */ /* Send destroy messages */
@ -1278,7 +1237,7 @@ static HWND WIN_FindWindow( HWND parent, HWND child, ATOM className, LPCWSTR tit
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return 0; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return 0;
} }
if (!(list = WIN_BuildWinArray( parent ))) if (!(list = WIN_ListChildren( parent )))
{ {
if (buffer) HeapFree( GetProcessHeap(), 0, buffer ); if (buffer) HeapFree( GetProcessHeap(), 0, buffer );
return 0; return 0;
@ -1301,7 +1260,7 @@ static HWND WIN_FindWindow( HWND parent, HWND child, ATOM className, LPCWSTR tit
if (GetWindowTextW( list[i], buffer, len ) && !strcmpiW( buffer, title )) break; if (GetWindowTextW( list[i], buffer, len ) && !strcmpiW( buffer, title )) break;
} }
retvalue = list[i]; retvalue = list[i];
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
if (buffer) HeapFree( GetProcessHeap(), 0, buffer ); if (buffer) HeapFree( GetProcessHeap(), 0, buffer );
/* In this case we need to check whether other processes /* In this case we need to check whether other processes
@ -2047,18 +2006,15 @@ HWND WINAPI GetParent( HWND hwnd )
WND *wndPtr; WND *wndPtr;
HWND retvalue = 0; HWND retvalue = 0;
if(!(wndPtr = WIN_FindWndPtr(hwnd))) return 0; if ((wndPtr = WIN_FindWndPtr(hwnd)))
if ((!(wndPtr->dwStyle & (WS_POPUP|WS_CHILD)))) {
goto end; if (wndPtr->dwStyle & WS_CHILD)
retvalue = wndPtr->parent->hwndSelf;
WIN_UpdateWndPtr(&wndPtr,((wndPtr->dwStyle & WS_CHILD) ? wndPtr->parent : wndPtr->owner)); else if (wndPtr->dwStyle & WS_POPUP)
if (wndPtr) retvalue = wndPtr->owner;
retvalue = wndPtr->hwndSelf;
end:
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
}
return retvalue; return retvalue;
} }
@ -2087,7 +2043,11 @@ HWND WINAPI GetAncestor( HWND hwnd, UINT type )
while (wndPtr->parent->hwndSelf != GetDesktopWindow()) while (wndPtr->parent->hwndSelf != GetDesktopWindow())
WIN_UpdateWndPtr( &wndPtr, wndPtr->parent ); WIN_UpdateWndPtr( &wndPtr, wndPtr->parent );
while (wndPtr->owner) while (wndPtr->owner)
WIN_UpdateWndPtr( &wndPtr, wndPtr->owner ); {
WND *ptr = WIN_FindWndPtr( wndPtr->owner );
WIN_ReleaseWndPtr( wndPtr );
wndPtr = ptr;
}
break; break;
} }
ret = wndPtr->hwndSelf; ret = wndPtr->hwndSelf;
@ -2189,19 +2149,15 @@ BOOL16 WINAPI IsChild16( HWND16 parent, HWND16 child )
*/ */
BOOL WINAPI IsChild( HWND parent, HWND child ) BOOL WINAPI IsChild( HWND parent, HWND child )
{ {
WND * wndPtr = WIN_FindWndPtr( child ); HWND *list = WIN_ListParents( child );
while (wndPtr && wndPtr->parent) int i;
{ BOOL ret;
WIN_UpdateWndPtr(&wndPtr,wndPtr->parent);
if (wndPtr->hwndSelf == GetDesktopWindow()) break; if (!list) return FALSE;
if (wndPtr->hwndSelf == parent) for (i = 0; list[i]; i++) if (list[i] == parent) break;
{ ret = (list[i] != 0);
WIN_ReleaseWndPtr(wndPtr); HeapFree( GetProcessHeap(), 0, list );
return TRUE; return ret;
}
}
WIN_ReleaseWndPtr(wndPtr);
return FALSE;
} }
@ -2219,19 +2175,16 @@ BOOL16 WINAPI IsWindowVisible16( HWND16 hwnd )
*/ */
BOOL WINAPI IsWindowVisible( HWND hwnd ) BOOL WINAPI IsWindowVisible( HWND hwnd )
{ {
HWND *list;
BOOL retval; BOOL retval;
WND *wndPtr = WIN_FindWndPtr( hwnd ); int i;
while (wndPtr && wndPtr->parent)
{ if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE;
if (!(wndPtr->dwStyle & WS_VISIBLE)) if (!(list = WIN_ListParents( hwnd ))) return TRUE;
{ for (i = 0; list[i]; i++)
WIN_ReleaseWndPtr(wndPtr); if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_VISIBLE)) break;
return FALSE; retval = !list[i];
} HeapFree( GetProcessHeap(), 0, list );
WIN_UpdateWndPtr(&wndPtr,wndPtr->parent);
}
retval = (wndPtr && (wndPtr->dwStyle & WS_VISIBLE));
WIN_ReleaseWndPtr(wndPtr);
return retval; return retval;
} }
@ -2245,13 +2198,21 @@ BOOL WINAPI IsWindowVisible( HWND hwnd )
*/ */
BOOL WIN_IsWindowDrawable( WND* wnd, BOOL icon ) BOOL WIN_IsWindowDrawable( WND* wnd, BOOL icon )
{ {
HWND *list;
BOOL retval;
int i;
if (!(wnd->dwStyle & WS_VISIBLE)) return FALSE; if (!(wnd->dwStyle & WS_VISIBLE)) return FALSE;
if ((wnd->dwStyle & WS_MINIMIZE) && if ((wnd->dwStyle & WS_MINIMIZE) &&
icon && GetClassLongA( wnd->hwndSelf, GCL_HICON )) return FALSE; icon && GetClassLongA( wnd->hwndSelf, GCL_HICON )) return FALSE;
for(wnd = wnd->parent; wnd; wnd = wnd->parent)
if( wnd->dwStyle & WS_MINIMIZE || if (!(list = WIN_ListParents( wnd->hwndSelf ))) return TRUE;
!(wnd->dwStyle & WS_VISIBLE) ) break; for (i = 0; list[i]; i++)
return (wnd == NULL); if ((GetWindowLongW( list[i], GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != WS_VISIBLE)
break;
retval = !list[i];
HeapFree( GetProcessHeap(), 0, list );
return retval;
} }
@ -2340,7 +2301,7 @@ HWND WINAPI GetWindow( HWND hwnd, WORD rel )
goto end; goto end;
case GW_OWNER: case GW_OWNER:
retval = wndPtr->owner ? wndPtr->owner->hwndSelf : 0; retval = wndPtr->owner;
goto end; goto end;
case GW_CHILD: case GW_CHILD:
@ -2378,7 +2339,7 @@ BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly )
{ {
int count = 0; int count = 0;
WND *pWnd; WND *pWnd;
HWND *win_array = WIN_BuildWinArray( GetDesktopWindow() ); HWND *win_array = WIN_ListChildren( GetDesktopWindow() );
if (!win_array) return TRUE; if (!win_array) return TRUE;
@ -2422,7 +2383,7 @@ BOOL WIN_InternalShowOwnedPopups( HWND owner, BOOL fShow, BOOL unmanagedOnly )
} }
WIN_ReleaseWndPtr( pWnd ); WIN_ReleaseWndPtr( pWnd );
} }
WIN_ReleaseWinArray( win_array ); HeapFree( GetProcessHeap(), 0, win_array );
return TRUE; return TRUE;
} }
@ -2443,7 +2404,7 @@ BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow )
{ {
int count = 0; int count = 0;
WND *pWnd; WND *pWnd;
HWND *win_array = WIN_BuildWinArray(GetDesktopWindow()); HWND *win_array = WIN_ListChildren( GetDesktopWindow() );
if (!win_array) return TRUE; if (!win_array) return TRUE;
@ -2482,7 +2443,7 @@ BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow )
} }
WIN_ReleaseWndPtr( pWnd ); WIN_ReleaseWndPtr( pWnd );
} }
WIN_ReleaseWinArray( win_array ); HeapFree( GetProcessHeap(), 0, win_array );
return TRUE; return TRUE;
} }
@ -2512,15 +2473,56 @@ HWND WINAPI GetLastActivePopup( HWND hwnd )
/******************************************************************* /*******************************************************************
* WIN_BuildWinArray * WIN_ListParents
* *
* Build an array of pointers to the children of a given window. * Build an array of all parents of a given window, starting with
* The array must be freed with WIN_ReleaseWinArray. Return NULL * the immediate parent. The array must be freed with HeapFree.
* when no windows are found. * Returns NULL if window is a top-level window.
*/ */
HWND *WIN_BuildWinArray( HWND hwnd ) HWND *WIN_ListParents( HWND hwnd )
{
WND *parent, *wndPtr = WIN_FindWndPtr( hwnd );
HWND *list = NULL;
UINT i, count = 0;
/* First count the windows */
if (!wndPtr) return NULL;
parent = wndPtr->parent;
while (parent && parent->hwndSelf != GetDesktopWindow())
{
count++;
parent = parent->parent;
}
if (count)
{
if ((list = HeapAlloc( GetProcessHeap(), 0, sizeof(HWND) * (count + 1) )))
{
parent = wndPtr->parent;
for (i = 0; i < count; i++)
{
list[i] = parent->hwndSelf;
parent = parent->parent;
}
list[i] = 0;
}
}
WIN_ReleaseWndPtr( wndPtr );
return list;
}
/*******************************************************************
* WIN_ListChildren
*
* Build an array of the children of a given window. The array must be
* freed with HeapFree. Returns NULL when no windows are found.
*/
HWND *WIN_ListChildren( HWND hwnd )
{ {
/* Future: this function will lock all windows associated with this array */
WND *pWnd, *wndPtr = WIN_FindWndPtr( hwnd ); WND *pWnd, *wndPtr = WIN_FindWndPtr( hwnd );
HWND *list, *phwnd; HWND *list, *phwnd;
UINT count = 0; UINT count = 0;
@ -2557,13 +2559,6 @@ HWND *WIN_BuildWinArray( HWND hwnd )
return list; return list;
} }
/*******************************************************************
* WIN_ReleaseWinArray
*/
void WIN_ReleaseWinArray(HWND *wndArray)
{
if (wndArray) HeapFree( GetProcessHeap(), 0, wndArray );
}
/******************************************************************* /*******************************************************************
* EnumWindows (USER32.@) * EnumWindows (USER32.@)
@ -2578,7 +2573,7 @@ BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam )
/* unpleasant side-effects, for instance if the callback */ /* unpleasant side-effects, for instance if the callback */
/* function changes the Z-order of the windows. */ /* function changes the Z-order of the windows. */
if (!(list = WIN_BuildWinArray( GetDesktopWindow() ))) return FALSE; if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return FALSE;
/* Now call the callback function for every window */ /* Now call the callback function for every window */
@ -2590,7 +2585,7 @@ BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam )
if (!(ret = lpEnumFunc( list[i], lParam ))) break; if (!(ret = lpEnumFunc( list[i], lParam ))) break;
} }
WIN_RestoreWndsLock(iWndsLocks); WIN_RestoreWndsLock(iWndsLocks);
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
return ret; return ret;
} }
@ -2615,7 +2610,7 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam )
HWND *list; HWND *list;
int i, iWndsLocks; int i, iWndsLocks;
if (!(list = WIN_BuildWinArray( GetDesktopWindow() ))) return FALSE; if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return FALSE;
/* Now call the callback function for every window */ /* Now call the callback function for every window */
@ -2626,7 +2621,7 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam )
if (!func( list[i], lParam )) break; if (!func( list[i], lParam )) break;
} }
WIN_RestoreWndsLock(iWndsLocks); WIN_RestoreWndsLock(iWndsLocks);
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
return TRUE; return TRUE;
} }
@ -2648,14 +2643,14 @@ static BOOL WIN_EnumChildWindows( HWND *list, WNDENUMPROC func, LPARAM lParam )
/* skip owned windows */ /* skip owned windows */
if (GetWindow( *list, GW_OWNER )) continue; if (GetWindow( *list, GW_OWNER )) continue;
/* Build children list first */ /* Build children list first */
childList = WIN_BuildWinArray( *list ); childList = WIN_ListChildren( *list );
ret = func( *list, lParam ); ret = func( *list, lParam );
if (childList) if (childList)
{ {
if (ret) ret = WIN_EnumChildWindows( childList, func, lParam ); if (ret) ret = WIN_EnumChildWindows( childList, func, lParam );
WIN_ReleaseWinArray(childList); HeapFree( GetProcessHeap(), 0, childList );
} }
if (!ret) return FALSE; if (!ret) return FALSE;
} }
@ -2671,11 +2666,11 @@ BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func, LPARAM lParam )
HWND *list; HWND *list;
int iWndsLocks; int iWndsLocks;
if (!(list = WIN_BuildWinArray( parent ))) return FALSE; if (!(list = WIN_ListChildren( parent ))) return FALSE;
iWndsLocks = WIN_SuspendWndsLock(); iWndsLocks = WIN_SuspendWndsLock();
WIN_EnumChildWindows( list, func, lParam ); WIN_EnumChildWindows( list, func, lParam );
WIN_RestoreWndsLock(iWndsLocks); WIN_RestoreWndsLock(iWndsLocks);
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
return TRUE; return TRUE;
} }
@ -2696,7 +2691,7 @@ BOOL WINAPI AnyPopup(void)
{ {
int i; int i;
BOOL retvalue; BOOL retvalue;
HWND *list = WIN_BuildWinArray( GetDesktopWindow() ); HWND *list = WIN_ListChildren( GetDesktopWindow() );
if (!list) return FALSE; if (!list) return FALSE;
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
@ -2704,7 +2699,7 @@ BOOL WINAPI AnyPopup(void)
if (IsWindowVisible( list[i] ) && GetWindow( list[i], GW_OWNER )) break; if (IsWindowVisible( list[i] ) && GetWindow( list[i], GW_OWNER )) break;
} }
retvalue = (list[i] != 0); retvalue = (list[i] != 0);
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
return retvalue; return retvalue;
} }

20
windows/winpos.c
View File

@ -553,7 +553,7 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags)
GetClientRect( hwndParent, &rect ); GetClientRect( hwndParent, &rect );
if (!PtInRect( &rect, pt )) return 0; if (!PtInRect( &rect, pt )) return 0;
if (!(list = WIN_BuildWinArray( hwndParent ))) return 0; if (!(list = WIN_ListChildren( hwndParent ))) return 0;
for (i = 0; list[i] && !retvalue; i++) for (i = 0; list[i] && !retvalue; i++)
{ {
@ -571,7 +571,7 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags)
} }
WIN_ReleaseWndPtr( wnd ); WIN_ReleaseWndPtr( wnd );
} }
WIN_ReleaseWinArray( list ); HeapFree( GetProcessHeap(), 0, list );
if (!retvalue) retvalue = hwndParent; if (!retvalue) retvalue = hwndParent;
return retvalue; return retvalue;
} }
@ -1523,7 +1523,7 @@ BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
DWORD old_thread = GetWindowThreadProcessId( hwndPrevActive, NULL ); DWORD old_thread = GetWindowThreadProcessId( hwndPrevActive, NULL );
DWORD new_thread = GetWindowThreadProcessId( hwndActive, NULL ); DWORD new_thread = GetWindowThreadProcessId( hwndActive, NULL );
if ((list = WIN_BuildWinArray( GetDesktopWindow() ))) if ((list = WIN_ListChildren( GetDesktopWindow() )))
{ {
for (phwnd = list; *phwnd; phwnd++) for (phwnd = list; *phwnd; phwnd++)
{ {
@ -1531,12 +1531,12 @@ BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
if (GetWindowThreadProcessId( *phwnd, NULL ) == old_thread) if (GetWindowThreadProcessId( *phwnd, NULL ) == old_thread)
SendMessageW( *phwnd, WM_ACTIVATEAPP, 0, new_thread ); SendMessageW( *phwnd, WM_ACTIVATEAPP, 0, new_thread );
} }
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
} }
hActiveQueue = hNewActiveQueue; hActiveQueue = hNewActiveQueue;
if ((list = WIN_BuildWinArray( GetDesktopWindow() ))) if ((list = WIN_ListChildren( GetDesktopWindow() )))
{ {
for (phwnd = list; *phwnd; phwnd++) for (phwnd = list; *phwnd; phwnd++)
{ {
@ -1544,7 +1544,7 @@ BOOL WINPOS_SetActiveWindow( HWND hWnd, BOOL fMouse, BOOL fChangeFocus)
if (GetWindowThreadProcessId( *phwnd, NULL ) == new_thread) if (GetWindowThreadProcessId( *phwnd, NULL ) == new_thread)
SendMessageW( *phwnd, WM_ACTIVATEAPP, 1, old_thread ); SendMessageW( *phwnd, WM_ACTIVATEAPP, 1, old_thread );
} }
WIN_ReleaseWinArray(list); HeapFree( GetProcessHeap(), 0, list );
} }
if (hWnd && !IsWindow(hWnd)) goto CLEANUP; if (hWnd && !IsWindow(hWnd)) goto CLEANUP;
@ -1625,6 +1625,7 @@ BOOL WINPOS_ActivateOtherWindow(HWND hwnd)
WND *pWnd; WND *pWnd;
HWND hwndActive = 0; HWND hwndActive = 0;
HWND hwndTo = 0; HWND hwndTo = 0;
HWND owner;
/* Get current active window from the active queue */ /* Get current active window from the active queue */
if ( hActiveQueue ) if ( hActiveQueue )
@ -1648,10 +1649,11 @@ BOOL WINPOS_ActivateOtherWindow(HWND hwnd)
return 0; return 0;
} }
if( !(pWnd->dwStyle & WS_POPUP) || !(pWnd->owner) || owner = GetWindow( hwnd, GW_OWNER );
!WINPOS_CanActivate((hwndTo = GetAncestor( pWnd->owner->hwndSelf, GA_ROOT ))) ) if( !(pWnd->dwStyle & WS_POPUP) || !owner ||
!WINPOS_CanActivate((hwndTo = GetAncestor( owner, GA_ROOT ))) )
{ {
HWND tmp = GetAncestor( pWnd->hwndSelf, GA_ROOT ); HWND tmp = GetAncestor( hwnd, GA_ROOT );
hwndTo = hwndPrevActive; hwndTo = hwndPrevActive;
while( !WINPOS_CanActivate(hwndTo) ) while( !WINPOS_CanActivate(hwndTo) )