Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 20:45:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a bug: __kernel_get_next_znode may returns -1; handle MSG_DUMPZORDER

Browse Source
This commit is contained in:
Vincent Wei
2020-02-29 16:04:53 +08:00
parent 8151cc2428
commit 6d04b42191
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/desktop-comm.c
+7 -4
View File
@@ -173,7 +173,6 @@ static int dskAddNewMainWindow (PMAINWIN pWin)
pWin->idx_znode = dskAllocZOrderNode (pWin);
if (pWin->idx_znode <= 0) {
_WRN_PRINTF ("Failed to allocate znode for main window.\n");
return -1;
}
@@ -322,8 +321,7 @@ static void dskMoveToTopMost (PMAINWIN pWin, int reason, LPARAM lParam)
dskHideGlobalControl (pWin, reason, lParam);
dskMove2Top (0, pWin->idx_znode);
// activate this main window.
if ( !(pWin->dwStyle & WS_VISIBLE) ) {
if (!(pWin->dwStyle & WS_VISIBLE)) {
pWin->dwStyle |= WS_VISIBLE;
dskShowWindow (0, pWin->idx_znode);
@@ -335,6 +333,7 @@ static void dskMoveToTopMost (PMAINWIN pWin, int reason, LPARAM lParam)
SendAsyncMessage ((HWND)pWin, MSG_NCPAINT, 0, 0);
}
// activate this main window.
if (reason != RCTM_SHOWCTRL)
dskSetActiveWindow (pWin);
}
@@ -1551,7 +1550,7 @@ static LRESULT WindowMessageHandler(UINT message, PMAINWIN pWin, LPARAM lParam)
lock_zi_for_read (zi);
from = __kernel_get_next_znode (zi, from);
while (from) {
while (from > 0) {
hwnd = nodes[from].hwnd;
if ((pWin = checkAndGetMainWindowPtrOfMainWin (hwnd)) &&
@@ -1566,6 +1565,10 @@ static LRESULT WindowMessageHandler(UINT message, PMAINWIN pWin, LPARAM lParam)
return (LRESULT)hwnd;
}
case MSG_DUMPZORDER:
dskDumpZOrder (__mg_zorder_info);
break;
/* Since 5.0.0 */
case MSG_SETALWAYSTOP:
return dskSetMainWindowAlwaysTop(pWin, (BOOL)lParam);