Jacek Caban : hhctrl.ocx: Release HHInfo on WM_CLOSE message.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 28 08:19:11 CST 2007
Module: wine
Branch: master
Commit: ae9c043d879f03926c0487d067dd12b8e2be3ac3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9c043d879f03926c0487d067dd12b8e2be3ac3
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Feb 28 03:52:39 2007 +0100
hhctrl.ocx: Release HHInfo on WM_CLOSE message.
---
dlls/hhctrl.ocx/help.c | 6 ++++++
dlls/hhctrl.ocx/hhctrl.c | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index fb9eca8..e98eb82 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -627,6 +627,9 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
break;
case WM_SIZE:
return Help_OnSize(hWnd);
+ case WM_CLOSE:
+ ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+ return 0;
case WM_DESTROY:
PostQuitMessage(0);
break;
@@ -780,6 +783,9 @@ void ReleaseHelpViewer(HHInfo *info)
ReleaseWebBrowser(info);
+ if(info->WinType.hwndHelp)
+ DestroyWindow(info->WinType.hwndHelp);
+
hhctrl_free(info);
OleUninitialize();
}
diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index b8c4f45..031c997 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -159,8 +159,6 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine)
DispatchMessageW(&msg);
}
- ReleaseHelpViewer(info);
-
return 0;
}
More information about the wine-cvs
mailing list