Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
bf34ca2d
Commit
bf34ca2d
authored
Feb 28, 2007
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 28, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hhctrl.ocx: Fixed releasing web browser object.
parent
24c13b9f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
7 deletions
+17
-7
webbrowser.c
dlls/hhctrl.ocx/webbrowser.c
+17
-7
No files found.
dlls/hhctrl.ocx/webbrowser.c
View file @
bf34ca2d
...
@@ -580,7 +580,7 @@ BOOL InitWebBrowser(HHInfo *info, HWND hwndParent)
...
@@ -580,7 +580,7 @@ BOOL InitWebBrowser(HHInfo *info, HWND hwndParent)
if
(
!
iOleClientSiteImpl
)
if
(
!
iOleClientSiteImpl
)
return
FALSE
;
return
FALSE
;
iOleClientSiteImpl
->
ref
=
0
;
iOleClientSiteImpl
->
ref
=
1
;
iOleClientSiteImpl
->
lpVtbl
=
&
MyIOleClientSiteTable
;
iOleClientSiteImpl
->
lpVtbl
=
&
MyIOleClientSiteTable
;
iOleClientSiteImpl
->
lpvtblOleInPlaceSite
=
&
MyIOleInPlaceSiteTable
;
iOleClientSiteImpl
->
lpvtblOleInPlaceSite
=
&
MyIOleInPlaceSiteTable
;
iOleClientSiteImpl
->
lpvtblOleInPlaceFrame
=
&
MyIOleInPlaceFrameTable
;
iOleClientSiteImpl
->
lpvtblOleInPlaceFrame
=
&
MyIOleInPlaceFrameTable
;
...
@@ -632,12 +632,7 @@ error:
...
@@ -632,12 +632,7 @@ error:
void
ReleaseWebBrowser
(
HHInfo
*
info
)
void
ReleaseWebBrowser
(
HHInfo
*
info
)
{
{
if
(
info
->
wb_object
)
HRESULT
hres
;
{
IOleObject_Close
(
info
->
wb_object
,
OLECLOSE_NOSAVE
);
IOleObject_Release
(
info
->
wb_object
);
info
->
wb_object
=
NULL
;
}
if
(
info
->
web_browser
)
if
(
info
->
web_browser
)
{
{
...
@@ -650,6 +645,21 @@ void ReleaseWebBrowser(HHInfo *info)
...
@@ -650,6 +645,21 @@ void ReleaseWebBrowser(HHInfo *info)
IOleClientSite_Release
(
info
->
client_site
);
IOleClientSite_Release
(
info
->
client_site
);
info
->
client_site
=
NULL
;
info
->
client_site
=
NULL
;
}
}
if
(
info
->
wb_object
)
{
IOleInPlaceSite
*
inplace
;
hres
=
IOleObject_QueryInterface
(
info
->
wb_object
,
&
IID_IOleInPlaceSite
,
(
void
**
)
&
inplace
);
if
(
SUCCEEDED
(
hres
))
{
IOleInPlaceSite_OnInPlaceDeactivate
(
inplace
);
IOleInPlaceSite_Release
(
inplace
);
}
IOleObject_SetClientSite
(
info
->
wb_object
,
NULL
);
IOleObject_Release
(
info
->
wb_object
);
info
->
wb_object
=
NULL
;
}
}
}
void
ResizeWebBrowser
(
HHInfo
*
info
,
DWORD
dwWidth
,
DWORD
dwHeight
)
void
ResizeWebBrowser
(
HHInfo
*
info
,
DWORD
dwWidth
,
DWORD
dwHeight
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment