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
30b24fbf
Commit
30b24fbf
authored
Nov 05, 2006
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 06, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shdocvw: Set parent window in activate_inplace.
parent
53fe2d15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
oleobject.c
dlls/shdocvw/oleobject.c
+6
-4
shdocvw.h
dlls/shdocvw/shdocvw.h
+0
-1
No files found.
dlls/shdocvw/oleobject.c
View file @
30b24fbf
...
...
@@ -30,6 +30,9 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
shdocvw
);
/* shlwapi.dll */
HWND
WINAPI
SHSetParentHwnd
(
HWND
hWnd
,
HWND
hWndParent
);
static
ATOM
shell_embedding_atom
=
0
;
static
LRESULT
resize_window
(
WebBrowser
*
This
,
LONG
width
,
LONG
height
)
...
...
@@ -127,9 +130,9 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, H
return
E_FAIL
;
}
hres
=
IOleInPlaceSite_GetWindow
(
This
->
inplace
,
&
This
->
ip
hwnd
);
if
(
FAIL
ED
(
hres
))
This
->
iphwnd
=
parent_hwnd
;
hres
=
IOleInPlaceSite_GetWindow
(
This
->
inplace
,
&
parent_
hwnd
);
if
(
SUCCEED
ED
(
hres
))
SHSetParentHwnd
(
This
->
shell_embedding_hwnd
,
parent_hwnd
)
;
IOleInPlaceSite_OnInPlaceActivate
(
This
->
inplace
);
...
...
@@ -810,7 +813,6 @@ void WebBrowser_OleObject_Init(WebBrowser *This)
This
->
client
=
NULL
;
This
->
inplace
=
NULL
;
This
->
container
=
NULL
;
This
->
iphwnd
=
NULL
;
This
->
frame_hwnd
=
NULL
;
This
->
frame
=
NULL
;
This
->
uiwindow
=
NULL
;
...
...
dlls/shdocvw/shdocvw.h
View file @
30b24fbf
...
...
@@ -111,7 +111,6 @@ struct WebBrowser {
/* window context */
HWND
iphwnd
;
HWND
frame_hwnd
;
IOleInPlaceFrame
*
frame
;
IOleInPlaceUIWindow
*
uiwindow
;
...
...
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