bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Wait for WM_NCDESTROY before calling OnBeforeClose (issue #2248)

This commit is contained in:
Marshall Greenblatt 2017-08-31 18:10:51 -04:00
parent 2c22842b7e
commit 3d5ae838ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcef/browser/native/browser_platform_delegate_native_win.cc
View File

@ -594,7 +594,7 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
// Allow the close. // Allow the close.
break; break;
case WM_DESTROY: case WM_NCDESTROY:
if (platform_delegate) { if (platform_delegate) {
// Clear the user data pointer. // Clear the user data pointer.
gfx::SetWindowUserData(hwnd, NULL); gfx::SetWindowUserData(hwnd, NULL);
@ -604,7 +604,7 @@ LRESULT CALLBACK CefBrowserPlatformDelegateNativeWin::WndProc(HWND hwnd,
// CreateHostWindow(). // CreateHostWindow().
browser->WindowDestroyed(); browser->WindowDestroyed();
} }
return 0; break;
case WM_SIZE: case WM_SIZE:
if (platform_delegate && platform_delegate->window_widget_) { if (platform_delegate && platform_delegate->window_widget_) {

2
tests/cefclient/browser/main_message_loop_multithreaded_win.cc
View File

@ -140,7 +140,7 @@ MainMessageLoopMultithreadedWin::MessageWndProc(HWND hWnd,
task->Release(); task->Release();
} else { } else {
switch (message) { switch (message) {
case WM_DESTROY: case WM_NCDESTROY:
// Clear the reference to |self|. // Clear the reference to |self|.
SetUserDataPtr(hWnd, NULL); SetUserDataPtr(hWnd, NULL);
break; break;

2
tests/cefclient/browser/root_window_win.cc
View File

@ -614,7 +614,7 @@ LRESULT CALLBACK RootWindowWin::RootWndProc(HWND hWnd,
SetUserDataPtr(hWnd, NULL); SetUserDataPtr(hWnd, NULL);
self->hwnd_ = NULL; self->hwnd_ = NULL;
self->OnDestroyed(); self->OnDestroyed();
return 0; break;
} }
return DefWindowProc(hWnd, message, wParam, lParam); return DefWindowProc(hWnd, message, wParam, lParam);