Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
a105f22e
Commit
a105f22e
authored
Mar 16, 2011
by
Thomas Faber
Committed by
Alexandre Julliard
Mar 18, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext.
parent
3e0053b4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
4 deletions
+5
-4
activex.c
dlls/mshtml/tests/activex.c
+1
-1
events.c
dlls/mshtml/tests/events.c
+1
-1
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+1
-1
script.c
dlls/mshtml/tests/script.c
+1
-1
view.c
dlls/mshtml/view.c
+1
-0
No files found.
dlls/mshtml/tests/activex.c
View file @
a105f22e
...
...
@@ -889,6 +889,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
ip_frame
=
NULL
;
ip_uiwindow
=
NULL
;
frame_info
.
cb
=
sizeof
(
OLEINPLACEFRAMEINFO
);
hres
=
IOleInPlaceSiteEx_GetWindowContext
(
ip_site
,
&
ip_frame
,
&
ip_uiwindow
,
&
pos_rect
,
&
clip_rect
,
&
frame_info
);
ok
(
hres
==
S_OK
,
"GetWindowContext failed: %08x
\n
"
,
hres
);
ok
(
ip_frame
!=
NULL
,
"ip_frame == NULL
\n
"
);
...
...
@@ -1534,7 +1535,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
*
lprcPosRect
=
rect
;
*
lprcClipRect
=
rect
;
lpFrameInfo
->
cb
=
sizeof
(
*
lpFrameInfo
);
lpFrameInfo
->
fMDIApp
=
FALSE
;
lpFrameInfo
->
hwndFrame
=
container_hwnd
;
lpFrameInfo
->
haccel
=
NULL
;
...
...
dlls/mshtml/tests/events.c
View file @
a105f22e
...
...
@@ -1969,7 +1969,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
*
lprcPosRect
=
rect
;
*
lprcClipRect
=
rect
;
lpFrameInfo
->
cb
=
sizeof
(
*
lpFrameInfo
);
ok
(
lpFrameInfo
->
cb
==
sizeof
(
*
lpFrameInfo
),
"lpFrameInfo->cb = %u, expected %u
\n
"
,
lpFrameInfo
->
cb
,
(
unsigned
)
sizeof
(
*
lpFrameInfo
)
);
lpFrameInfo
->
fMDIApp
=
FALSE
;
lpFrameInfo
->
hwndFrame
=
container_hwnd
;
lpFrameInfo
->
haccel
=
NULL
;
...
...
dlls/mshtml/tests/htmldoc.c
View file @
a105f22e
...
...
@@ -1701,7 +1701,7 @@ static HRESULT WINAPI InPlaceSiteWindowless_GetWindowContext(
memcpy
(
lprcClipRect
,
&
rect
,
sizeof
(
RECT
));
ok
(
lpFrameInfo
!=
NULL
,
"lpFrameInfo = NULL
\n
"
);
if
(
lpFrameInfo
)
{
lpFrameInfo
->
cb
=
sizeof
(
*
lpFrameInfo
);
ok
(
lpFrameInfo
->
cb
==
sizeof
(
*
lpFrameInfo
),
"lpFrameInfo->cb = %u, expected %u
\n
"
,
lpFrameInfo
->
cb
,
(
unsigned
)
sizeof
(
*
lpFrameInfo
)
);
lpFrameInfo
->
fMDIApp
=
FALSE
;
lpFrameInfo
->
hwndFrame
=
container_hwnd
;
lpFrameInfo
->
haccel
=
NULL
;
...
...
dlls/mshtml/tests/script.c
View file @
a105f22e
...
...
@@ -883,7 +883,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
*
lprcPosRect
=
rect
;
*
lprcClipRect
=
rect
;
lpFrameInfo
->
cb
=
sizeof
(
*
lpFrameInfo
);
ok
(
lpFrameInfo
->
cb
==
sizeof
(
*
lpFrameInfo
),
"lpFrameInfo->cb = %u, expected %u
\n
"
,
lpFrameInfo
->
cb
,
(
unsigned
)
sizeof
(
*
lpFrameInfo
)
);
lpFrameInfo
->
fMDIApp
=
FALSE
;
lpFrameInfo
->
hwndFrame
=
container_hwnd
;
lpFrameInfo
->
haccel
=
NULL
;
...
...
dlls/mshtml/view.c
View file @
a105f22e
...
...
@@ -259,6 +259,7 @@ static HRESULT activate_window(HTMLDocumentObj *This)
return
FAILED
(
hres
)
?
hres
:
E_FAIL
;
}
frameinfo
.
cb
=
sizeof
(
OLEINPLACEFRAMEINFO
);
hres
=
IOleInPlaceSite_GetWindowContext
(
This
->
ipsite
,
&
pIPFrame
,
&
This
->
ip_window
,
&
posrect
,
&
cliprect
,
&
frameinfo
);
if
(
FAILED
(
hres
))
{
...
...
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