Jacek Caban : mshtml: Clean up OleCommandTarget_Exec.
Alexandre Julliard
julliard at winehq.org
Mon Apr 22 14:29:18 CDT 2013
Module: wine
Branch: master
Commit: f359360228e3ed62e63853eddd5a2da8e0429196
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f359360228e3ed62e63853eddd5a2da8e0429196
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 22 16:19:57 2013 +0200
mshtml: Clean up OleCommandTarget_Exec.
---
dlls/mshtml/tests/htmldoc.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index ae8af82..de003f1 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -2733,12 +2733,9 @@ static void test_save_history(IUnknown *unk)
static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup,
DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer))
- && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)
- || (nCmdID != 63 && (!is_refresh || nCmdID != 37))))
+ if(!pguidCmdGroup) {
test_readyState(NULL);
- if(!pguidCmdGroup) {
switch(nCmdID) {
case OLECMDID_SETPROGRESSMAX:
CHECK_EXPECT2(Exec_SETPROGRESSMAX);
@@ -2825,6 +2822,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
}
if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) {
+ if(nCmdID != 63 && (!is_refresh || nCmdID != 37))
+ test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) {
@@ -2938,6 +2937,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
}
if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) {
+ test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) {
@@ -2955,6 +2955,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
switch(nCmdID) {
case DOCHOST_DOCCANNAVIGATE:
CHECK_EXPECT(Exec_DOCCANNAVIGATE);
+
+ test_readyState(NULL);
+
ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(pvaOut == NULL, "pvaOut != NULL\n");
ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n");
@@ -2967,6 +2970,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
VARIANT var;
HRESULT hres;
+ test_readyState(NULL);
+
ok(pvaIn != NULL, "pvaIn == NULL\n");
ok(pvaOut != NULL || broken(!pvaOut), "pvaOut != NULL\n");
ok(V_VT(pvaIn) == VT_ARRAY, "V_VT(pvaIn) = %d\n", V_VT(pvaIn));
@@ -3018,6 +3023,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
}
if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) {
+ test_readyState(NULL);
ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt);
switch(nCmdID) {
@@ -3047,6 +3053,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
}
if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) {
+ test_readyState(NULL);
+
switch (nCmdID) {
case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */
SET_EXPECT(SetStatusText);
More information about the wine-cvs
mailing list