Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-07 19:12:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a fatal bug: call __mg_throw_away_messages in CreateMainWindowEx2, CreateVirtualWindow, and CreateWindowEx2 when failed to create a new window.

Browse Source
This commit is contained in:
Vincent Wei
2020-02-27 21:10:23 +08:00
parent ace5a0d263
commit dfe6c026ef
1 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/gui/window.c
View File

@@ -3713,8 +3713,6 @@ static void guiAddNewHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted)
}
else
pHosting->pFirstHosted = pHosted;
return;
}
/* moved here from desktop.c; can be used on virtual window */
@@ -3725,21 +3723,30 @@ static void guiRemoveHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted)
head = pHosting->pFirstHosted;
if (head == pHosted) {
pHosting->pFirstHosted = head->pNextHosted;
return;
}
while (head) {
prev = head;
head = head->pNextHosted;
if (head == pHosted) {
prev->pNextHosted = head->pNextHosted;
return;
else {
while (head) {
prev = head;
head = head->pNextHosted;
if (head == pHosted) {
prev->pNextHosted = head->pNextHosted;
break;
}
}
}
return;
#if 1 /* debug code */
head = pHosting->pFirstHosted;
while (head) {
if (head == pHosted) {
assert (0);
}
head = head->pNextHosted;
}
#endif /* debug code */
}
/************************* Support for virtual window ************************/
#ifdef _MGHAVE_VIRTUAL_WINDOW
@@ -3911,6 +3918,11 @@ err:
assert (pMsgQueue->nrWindows == 0);
}
/* Since 5.0.0: we must throw away the messages for this window, because
there are some messages, have been put into the message queue.
Or DispatchMessage will panic. */
__mg_throw_away_messages (pMsgQueue, (HWND)pVirtWin);
free (pVirtWin);
return HWND_INVALID;
}
@@ -4364,10 +4376,6 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
pWin->pGCRInfo = &pWin->GCRInfo;
#endif
/* handle hosting relationship */
if (pWin->pHosting)
guiAddNewHostedMainWindow (pWin->pHosting, pWin);
if (SendMessage (HWND_DESKTOP, MSG_ADDNEWMAINWIN,
(WPARAM)pWin, (LPARAM)&ct_info) < 0)
goto err;
@@ -4384,10 +4392,14 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
* child windows. */
if (SendMessage ((HWND)pWin, MSG_CREATE,
(WPARAM)pWin->pHosting, (LPARAM)pCreateInfo)) {
SendMessage(HWND_DESKTOP, MSG_REMOVEMAINWIN, (WPARAM)pWin, 0);
SendMessage (HWND_DESKTOP, MSG_REMOVEMAINWIN, (WPARAM)pWin, 0);
goto err;
}
/* handle hosting relationship after the main window was created at last */
if (pWin->pHosting)
guiAddNewHostedMainWindow (pWin->pHosting, pWin);
#if 0
/* Create private client dc. */
if (pWin->dwExStyle & WS_EX_USEPRIVATECDC) {
@@ -4416,9 +4428,6 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
return (HWND)pWin;
err:
if (pWin->pHosting)
guiRemoveHostedMainWindow (pWin->pHosting, pWin);
#ifdef _MGSCHEMA_COMPOSITING
if (pWin->surf)
GAL_FreeSurface (pWin->surf);
@@ -4431,6 +4440,11 @@ err:
assert (pWin->pMsgQueue->nrWindows == 0);
}
/* Since 5.0.0: we must throw away the messages for this window, because
there are some messages, e.g., MSG_CSIZECHANGED, have been put into
the message queue. Or DispatchMessage will panic. */
__mg_throw_away_messages (pWin->pMsgQueue, (HWND)pWin);
free (pWin);
return HWND_INVALID;
}
@@ -6050,9 +6064,10 @@ HWND GUIAPI CreateWindowEx2 (const char* spClassName,
goto error;
}
//set ctrl as main
if(pNewCtrl->dwExStyle & WS_EX_CTRLASMAINWIN){
pNewCtrl->next_ctrl_as_main = (PCONTROL)pNewCtrl->pMainWin->hFirstChildAsMainWin;
// set ctrl acts as main window
if (pNewCtrl->dwExStyle & WS_EX_CTRLASMAINWIN) {
pNewCtrl->next_ctrl_as_main =
(PCONTROL)pNewCtrl->pMainWin->hFirstChildAsMainWin;
pMainWin->hFirstChildAsMainWin = (HWND) pNewCtrl;
}
@@ -6093,6 +6108,12 @@ error:
free (pNewCtrl->pGCRInfo);
#endif
}
/* Since 5.0.0: we must throw away the messages for this window, because
there are some messages, have been put into the message queue.
Or DispatchMessage will panic. */
__mg_throw_away_messages (pMainWin->pMsgQueue, (HWND)pNewCtrl);
free (pNewCtrl);
return HWND_INVALID;