ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Call StatusTextChange in set_status_text.

This commit is contained in:
Jacek Caban 2008-01-14 16:26:47 +01:00 committed by Alexandre Julliard
parent 6f3ffa51f8
commit 84eed025f0
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/shdocvw/navigate.c
View File

@ -94,10 +94,19 @@ static void dump_BINDINFO(BINDINFO *bi)
static void set_status_text(BindStatusCallback *This, LPCWSTR str) static void set_status_text(BindStatusCallback *This, LPCWSTR str)
{ {
if(!This->doc_host || !This->doc_host->frame) VARIANTARG arg;
DISPPARAMS dispparams = {&arg, NULL, 1, 0};
if(!This->doc_host)
return; return;
IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); V_VT(&arg) = VT_BSTR;
V_BSTR(&arg) = str ? SysAllocString(str) : NULL;
call_sink(This->doc_host->cps.wbe2, DISPID_STATUSTEXTCHANGE, &dispparams);
VariantClear(&arg);
if(This->doc_host->frame)
IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str);
} }
#define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface)

6
dlls/shdocvw/tests/webbrowser.c
View File

@ -513,7 +513,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n"); ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n");
ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs);
/* TODO: Check args */ ok(V_VT(pDispParams->rgvarg) == VT_BSTR, "V_VT(pDispParams->rgvarg)=%d, expected VT_BSTR\n",
V_VT(pDispParams->rgvarg));
/* TODO: Check text */
break; break;
case DISPID_PROPERTYCHANGE: case DISPID_PROPERTYCHANGE:
@ -1878,7 +1880,7 @@ static void test_Navigate2(IUnknown *unk)
todo_wine CHECK_CALLED(Invoke_DOWNLOADBEGIN); todo_wine CHECK_CALLED(Invoke_DOWNLOADBEGIN);
todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1);
CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(EnableModeless_FALSE);
todo_wine CHECK_CALLED(Invoke_STATUSTEXTCHANGE); CHECK_CALLED(Invoke_STATUSTEXTCHANGE);
CHECK_CALLED(SetStatusText); CHECK_CALLED(SetStatusText);
CHECK_CALLED(GetHostInfo); CHECK_CALLED(GetHostInfo);
CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL);