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
c20167db
Commit
c20167db
authored
Nov 15, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 15, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Fixed activex tests on IE10.
parent
3a9666f1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
activex.c
dlls/mshtml/tests/activex.c
+5
-6
No files found.
dlls/mshtml/tests/activex.c
View file @
c20167db
...
@@ -1343,7 +1343,7 @@ static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObjectWindowless
...
@@ -1343,7 +1343,7 @@ static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObjectWindowless
static
HRESULT
WINAPI
OleInPlaceObject_SetObjectRects
(
IOleInPlaceObjectWindowless
*
iface
,
static
HRESULT
WINAPI
OleInPlaceObject_SetObjectRects
(
IOleInPlaceObjectWindowless
*
iface
,
LPCRECT
lprcPosRect
,
LPCRECT
lprcClipRect
)
LPCRECT
lprcPosRect
,
LPCRECT
lprcClipRect
)
{
{
CHECK_EXPECT
(
SetObjectRects
);
CHECK_EXPECT
2
(
SetObjectRects
);
return
S_OK
;
return
S_OK
;
}
}
...
@@ -1675,7 +1675,7 @@ static void test_object_elem(IHTMLDocument2 *doc)
...
@@ -1675,7 +1675,7 @@ static void test_object_elem(IHTMLDocument2 *doc)
hres
=
IHTMLObjectElement_put_width
(
objelem
,
v
);
hres
=
IHTMLObjectElement_put_width
(
objelem
,
v
);
ok
(
hres
==
S_OK
,
"put_width failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"put_width failed: %08x
\n
"
,
hres
);
CHECK_CALLED
(
OnAmbientPropertyChange_UNKNOWN
);
CHECK_CALLED
(
OnAmbientPropertyChange_UNKNOWN
);
C
HECK_CALLED
(
Invoke_ENABLED
);
C
LEAR_CALLED
(
Invoke_ENABLED
);
/* Not called on IE10 */
hres
=
IHTMLObjectElement_get_width
(
objelem
,
&
v
);
hres
=
IHTMLObjectElement_get_width
(
objelem
,
&
v
);
ok
(
hres
==
S_OK
,
"get_width failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_width failed: %08x
\n
"
,
hres
);
...
@@ -1690,7 +1690,7 @@ static void test_object_elem(IHTMLDocument2 *doc)
...
@@ -1690,7 +1690,7 @@ static void test_object_elem(IHTMLDocument2 *doc)
hres
=
IHTMLObjectElement_put_height
(
objelem
,
v
);
hres
=
IHTMLObjectElement_put_height
(
objelem
,
v
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"put_height failed: %08x
\n
"
,
hres
);
CHECK_CALLED
(
OnAmbientPropertyChange_UNKNOWN
);
CHECK_CALLED
(
OnAmbientPropertyChange_UNKNOWN
);
C
HECK_CALLED
(
Invoke_ENABLED
);
C
LEAR_CALLED
(
Invoke_ENABLED
);
/* Not called on IE10 */
hres
=
IHTMLObjectElement_get_height
(
objelem
,
&
v
);
hres
=
IHTMLObjectElement_get_height
(
objelem
,
&
v
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"get_height failed: %08x
\n
"
,
hres
);
...
@@ -1757,7 +1757,7 @@ static void test_ui_activate(void)
...
@@ -1757,7 +1757,7 @@ static void test_ui_activate(void)
SET_EXPECT
(
Invoke_ENABLED
);
SET_EXPECT
(
Invoke_ENABLED
);
hres
=
IOleInPlaceSite_OnUIActivate
(
ip_site
);
hres
=
IOleInPlaceSite_OnUIActivate
(
ip_site
);
ok
(
hres
==
S_OK
,
"OnUIActivate failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"OnUIActivate failed: %08x
\n
"
,
hres
);
C
HECK_CALLED
(
Invoke_ENABLED
);
C
LEAR_CALLED
(
Invoke_ENABLED
);
/* Not called on IE10 */
IOleInPlaceSite_Release
(
ip_site
);
IOleInPlaceSite_Release
(
ip_site
);
}
}
...
@@ -2448,8 +2448,7 @@ static void test_flash_ax(void)
...
@@ -2448,8 +2448,7 @@ static void test_flash_ax(void)
SET_EXPECT
(
SetClientSite_NULL
);
SET_EXPECT
(
SetClientSite_NULL
);
release_doc
(
doc
);
release_doc
(
doc
);
CHECK_CALLED
(
UIDeactivate
);
CHECK_CALLED
(
UIDeactivate
);
todo_wine
CLEAR_CALLED
(
Invoke_ENABLED
);
/* Not called on IE10 */
CHECK_CALLED
(
Invoke_ENABLED
);
todo_wine
todo_wine
CHECK_CALLED
(
Invoke_VALID
);
CHECK_CALLED
(
Invoke_VALID
);
CHECK_CALLED
(
InPlaceDeactivate
);
CHECK_CALLED
(
InPlaceDeactivate
);
...
...
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