wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Rob Shearman : ole32: Add some tests for the flags input to CoRegisterClassObject.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 7ba4b81675e52c6db3c05ee7f9717f13395fb631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba4b81675e52c6db3c05ee7f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 17:49:05 2007 +0000 ole32: Add some tests for the flags input to CoRegisterClassObject. --- dlls/ole32/tests/compobj.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2d2cf12..e9b2ca9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -640,6 +640,67 @@ static void test_CoMarshalInterThreadInterfaceInStream(void) CoUninitialize(); } +static void test_CoRegisterClassObject(void) +{ + static const CLSID CLSID_WineOOPTest = { + 0x5201163f, + 0x8164, + 0x4fd0, + {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} + }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ + DWORD cookie; + HRESULT hr; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + /* CLSCTX_INPROC_SERVER */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_MULTI_SEPARATE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + /* CLSCTX_LOCAL_SERVER */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_MULTI_SEPARATE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + /* CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + CoUninitialize(); +} + START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); @@ -662,4 +723,5 @@ START_TEST(compobj) test_CoGetInterfaceAndReleaseStream(); test_CoMarshalInterface(); test_CoMarshalInterThreadInterfaceInStream(); + test_CoRegisterClassObject(); }

1 0

Rob Shearman : ole32: Close the named pipe after revoking local server objects.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 880542a9f87ec7a2b023753f7e192582b478737f URL: http://source.winehq.org/git/wine.git/?a=commit;h=880542a9f87ec7a2b023753f7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 17:42:34 2007 +0000 ole32: Close the named pipe after revoking local server objects. --- dlls/ole32/compobj.c | 9 ++++++++- dlls/ole32/compobj_private.h | 3 ++- dlls/ole32/rpc.c | 37 +++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bac067a..98ec995 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -123,6 +123,7 @@ typedef struct tagRegisteredClass DWORD connectFlags; DWORD dwCookie; LPSTREAM pMarshaledData; /* FIXME: only really need to store OXID and IPID */ + void *RpcRegistration; struct tagRegisteredClass* nextClass; } RegisteredClass; @@ -1574,6 +1575,7 @@ HRESULT WINAPI CoRegisterClassObject( newClass->runContext = dwClsContext; newClass->connectFlags = flags; newClass->pMarshaledData = NULL; + newClass->RpcRegistration = NULL; /* * Use the address of the chain node as the cookie since we are sure it's @@ -1618,7 +1620,9 @@ HRESULT WINAPI CoRegisterClassObject( IUnknown_Release(classfac); - RPC_StartLocalServer(&newClass->classIdentifier, newClass->pMarshaledData); + hr = RPC_StartLocalServer(&newClass->classIdentifier, + newClass->pMarshaledData, + &newClass->RpcRegistration); } return S_OK; } @@ -1667,6 +1671,9 @@ HRESULT WINAPI CoRevokeClassObject( */ *prevClassLink = curClass->nextClass; + if (curClass->runContext & CLSCTX_LOCAL_SERVER) + RPC_StopLocalServer(curClass->RpcRegistration); + /* * Release the reference to the class object. */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index b77e05f..4c96a3c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -221,7 +221,8 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); void RPC_UnregisterInterface(REFIID riid); -void RPC_StartLocalServer(REFCLSID clsid, IStream *stream); +HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, void **registration); +void RPC_StopLocalServer(void *registration); HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv); HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook); void RPC_UnregisterAllChannelHooks(void); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index fdb81ed..3320552 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1732,6 +1732,7 @@ struct local_server_params CLSID clsid; IStream *stream; HANDLE ready_event; + HANDLE pipe; }; /* FIXME: should call to rpcss instead */ @@ -1757,6 +1758,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + lsp->pipe = hPipe; SetEvent(lsp->ready_event); HeapFree(GetProcessHeap(), 0, lsp); @@ -1768,9 +1770,21 @@ static DWORD WINAPI local_server_thread(LPVOID param) } while (1) { - if (!ConnectNamedPipe(hPipe,NULL) && GetLastError() != ERROR_PIPE_CONNECTED) { - ERR("Failure during ConnectNamedPipe %u, ABORT!\n",GetLastError()); - break; + if (!ConnectNamedPipe(hPipe,NULL)) + { + DWORD error = GetLastError(); + /* client already connected isn't an error */ + if (error != ERROR_PIPE_CONNECTED) + { + /* if error wasn't caused by RPC_StopLocalServer closing the + * pipe for us */ + if (error != ERROR_INVALID_HANDLE) + { + ERR("Failure during ConnectNamedPipe %u\n", error); + CloseHandle(hPipe); + } + break; + } } TRACE("marshalling IClassFactory to client\n"); @@ -1804,12 +1818,12 @@ static DWORD WINAPI local_server_thread(LPVOID param) TRACE("done marshalling IClassFactory\n"); } - CloseHandle(hPipe); IStream_Release(pStm); return 0; } -void RPC_StartLocalServer(REFCLSID clsid, IStream *stream) +/* starts listening for a local server */ +HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, void **registration) { DWORD tid; HANDLE thread, ready_event; @@ -1821,9 +1835,20 @@ void RPC_StartLocalServer(REFCLSID clsid, IStream *stream) lsp->ready_event = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); + if (!thread) + return HRESULT_FROM_WIN32(GetLastError()); CloseHandle(thread); - /* FIXME: failure handling */ WaitForSingleObject(ready_event, INFINITE); CloseHandle(ready_event); + + *registration = lsp->pipe; + return S_OK; +} + +/* stops listening for a local server */ +void RPC_StopLocalServer(void *registration) +{ + HANDLE pipe = registration; + CloseHandle(pipe); }

1 0

Rob Shearman : ole32: Enable local server test and make it work with Win9x COM implementation.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 2a021b50d4b455fd696cc7e8fa914f0ce6fb14fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a021b50d4b455fd696cc7e8f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 17:40:40 2007 +0000 ole32: Enable local server test and make it work with Win9x COM implementation. --- dlls/ole32/tests/marshal.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 308d848..f06475d 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2178,7 +2178,7 @@ static const IClassFactoryVtbl TestClassFactoryOOP_Vtbl = static IClassFactory TestOOP_ClassFactory = { &TestClassFactoryOOP_Vtbl }; /* tests functions commonly used by out of process COM servers */ -static void test_out_of_process_com(void) +static void test_local_server(void) { static const CLSID CLSID_WineOOPTest = { 0x5201163f, @@ -2204,10 +2204,9 @@ static void test_out_of_process_com(void) * class in the registry */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - todo_wine { - ok(hr == REGDB_E_CLASSNOTREG, + ok(hr == REGDB_E_CLASSNOTREG || /* NT */ + hr == S_OK /* Win9x */, "CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); - } /* Resume the object suspended above ... */ hr = CoResumeClassObjects(); @@ -2224,27 +2223,27 @@ static void test_out_of_process_com(void) ok_no_locks(); hr = IClassFactory_LockServer(cf, TRUE); - trace("IClassFactory_LockServer returned 0x%08x\n", hr); + ok_ole_success(hr, IClassFactory_LockServer); ok_more_than_one_lock(); IClassFactory_LockServer(cf, FALSE); + ok_ole_success(hr, IClassFactory_LockServer); ok_no_locks(); IClassFactory_Release(cf); /* wait for shutdown signal */ - ret = WaitForSingleObject(heventShutdown, 5000); - todo_wine { ok(ret != WAIT_TIMEOUT, "Server didn't shut down or machine is under very heavy load\n"); } + ret = WaitForSingleObject(heventShutdown, 0); + todo_wine { ok(ret != WAIT_TIMEOUT, "Server didn't shut down\n"); } /* try to connect again after SCM has suspended registered class objects */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - todo_wine { - ok(hr == CO_E_SERVER_STOPPING, + ok(hr == CO_E_SERVER_STOPPING || /* NT */ + hr == S_OK /* Win9x */, "CoGetClassObject should have returned CO_E_SERVER_STOPPING instead of 0x%08x\n", hr); - } hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); @@ -2582,8 +2581,7 @@ START_TEST(marshal) test_inproc_handler(); test_handler_marshaling(); - /* doesn't pass with Win9x COM DLLs (even though Essential COM says it should) */ - if (0) test_out_of_process_com(); + test_local_server(); test_globalinterfacetable();

1 0

Rob Shearman : ole32: REGCLS_MULTIPLEUSE implies CLSCTX_INPROC_SERVER in CoRegisterClassObject.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: c826515e55079a7c5bba2d2cba5fc3c4b574124f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c826515e55079a7c5bba2d2cb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 17:39:58 2007 +0000 ole32: REGCLS_MULTIPLEUSE implies CLSCTX_INPROC_SERVER in CoRegisterClassObject. --- dlls/ole32/compobj.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a20cb94..bac067a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1542,6 +1542,11 @@ HRESULT WINAPI CoRegisterClassObject( *lpdwRegister = 0; + /* REGCLS_MULTIPLEUSE implies registering as inproc server. This is what + * differentiates the flag from REGCLS_MULTI_SEPARATE. */ + if (flags & REGCLS_MULTIPLEUSE) + dwClsContext |= CLSCTX_INPROC_SERVER; + /* * First, check if the class is already registered. * If it is, this should cause an error.

1 0

Jacek Caban : mshtml: Use get_client_disp_property in SetClientSite to get silent property.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 5fd727fa2a160fbfc66afb35b913419c1c0a6c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd727fa2a160fbfc66afb35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:48:09 2007 +0100 mshtml: Use get_client_disp_property in SetClientSite to get silent property. --- dlls/mshtml/oleobj.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 343facc..2689e4c 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -66,6 +66,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = OLEOBJ_THIS(iface); IDocHostUIHandler *pDocHostUIHandler = NULL; IOleCommandTarget *cmdtrg = NULL; + VARIANT silent; HRESULT hres; TRACE("(%p)->(%p)\n", This, pClientSite); @@ -171,7 +172,15 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_SILENT); + + hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent); + if(SUCCEEDED(hres)) { + if(V_VT(&silent) != VT_BOOL) + WARN("V_VT(silent) = %d\n", V_VT(&silent)); + else if(V_BOOL(&silent)) + FIXME("silent == true\n"); + } + IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERAGENT); IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_PALETTE);

1 0

Jacek Caban : shdocvw: Added Navigate2 test.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 1790fdeeff7b37acb33885d96c5377148ba627b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1790fdeeff7b37acb33885d96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:58:52 2007 +0100 shdocvw: Added Navigate2 test. --- dlls/shdocvw/tests/Makefile.in | 2 +- dlls/shdocvw/tests/webbrowser.c | 147 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 139 insertions(+), 10 deletions(-) diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 1b53b9d..77647da 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shdocvw.dll -IMPORTS = shell32 ole32 user32 advapi32 kernel32 +IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index ac70c80..d9e9cf0 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -29,6 +29,8 @@ #include "htiframe.h" #include "mshtmhst.h" #include "idispids.h" +#include "olectl.h" +#include "mshtmdid.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -66,8 +68,18 @@ DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(Frame_SetActiveObject); DEFINE_EXPECT(UIWindow_SetActiveObject); DEFINE_EXPECT(SetMenu); +DEFINE_EXPECT(Invoke_AMBIENT_USERMODE); +DEFINE_EXPECT(Invoke_AMBIENT_DLCONTROL); +DEFINE_EXPECT(Invoke_AMBIENT_USERAGENT); +DEFINE_EXPECT(Invoke_AMBIENT_PALETTE); DEFINE_EXPECT(Invoke_AMBIENT_SILENT); DEFINE_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); +DEFINE_EXPECT(EnableModeless_TRUE); +DEFINE_EXPECT(EnableModeless_FALSE); +DEFINE_EXPECT(GetHostInfo); +DEFINE_EXPECT(GetOptionKeyPath); +DEFINE_EXPECT(GetOverridesKeyPath); +DEFINE_EXPECT(SetStatusText); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -169,7 +181,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); ok(pDispParams != NULL, "pDispParams == NULL\n"); ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo); - ok(puArgErr == NULL, "puArgErr=%p\n", puArgErr); ok(V_VT(pVarResult) == VT_EMPTY, "V_VT(pVarResult)=%d\n", V_VT(pVarResult)); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags); ok(pDispParams->rgvarg == NULL, "pDispParams->rgvarg = %p\n", pDispParams->rgvarg); @@ -179,13 +190,30 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pDispParams->cNamedArgs == 0, "pDispParams->cNamedArgs = %d\n", pDispParams->cNamedArgs); switch(dispIdMember) { + case DISPID_AMBIENT_USERMODE: + CHECK_EXPECT2(Invoke_AMBIENT_USERMODE); + return E_FAIL; + case DISPID_AMBIENT_DLCONTROL: + CHECK_EXPECT(Invoke_AMBIENT_DLCONTROL); + ok(puArgErr != NULL, "puArgErr=%p\n", puArgErr); + return E_FAIL; + case DISPID_AMBIENT_USERAGENT: + CHECK_EXPECT(Invoke_AMBIENT_USERAGENT); + ok(puArgErr != NULL, "puArgErr=%p\n", puArgErr); + return E_FAIL; + case DISPID_AMBIENT_PALETTE: + CHECK_EXPECT(Invoke_AMBIENT_PALETTE); + ok(puArgErr != NULL, "puArgErr=%p\n", puArgErr); + return E_FAIL; case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: CHECK_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + ok(puArgErr == NULL, "puArgErr=%p\n", puArgErr); V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = VARIANT_FALSE; return S_OK; case DISPID_AMBIENT_SILENT: CHECK_EXPECT(Invoke_AMBIENT_SILENT); + ok(puArgErr == NULL, "puArgErr=%p\n", puArgErr); V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = VARIANT_FALSE; return S_OK; @@ -380,14 +408,18 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(SetStatusText); + /* FIXME: Check pszStatusText */ + return S_OK; } static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + if(fEnable) + CHECK_EXPECT(EnableModeless_TRUE); + else + CHECK_EXPECT(EnableModeless_FALSE); + return S_OK; } static HRESULT WINAPI InPlaceFrame_TranslateAccelerator(IOleInPlaceFrame *iface, LPMSG lpmsg, WORD wID) @@ -618,8 +650,17 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetHostInfo); + ok(pInfo != NULL, "pInfo=NULL\n"); + if(pInfo) { + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u, expected %u\n", + pInfo->cbSize, sizeof(DOCHOSTUIINFO)); + ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags); + ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick); + ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss); + ok(!pInfo->pchHostNS, "pInfo->pchhostNS=%p, expected NULL\n", pInfo->pchHostNS); + } + return E_FAIL; } static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD dwID, @@ -677,7 +718,11 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 * static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, LPOLESTR *pchKey, DWORD dw) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(GetOptionKeyPath); + ok(pchKey != NULL, "pchKey==NULL\n"); + if(pchKey) + ok(*pchKey == NULL, "*pchKey=%p\n", *pchKey); + ok(!dw, "dw=%x\n", dw); return E_NOTIMPL; } @@ -711,7 +756,11 @@ static HRESULT WINAPI DocHostUIHandler_FilterDataObject(IDocHostUIHandler2 *ifac static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *iface, LPOLESTR *pchKey, DWORD dw) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(GetOverridesKeyPath); + ok(pchKey != NULL, "pchKey==NULL\n"); + if(pchKey) + ok(*pchKey == NULL, "*pchKey=%p\n", *pchKey); + ok(!dw, "dw=%x\n", dw); return E_NOTIMPL; } @@ -1256,6 +1305,51 @@ static void test_Extent(IUnknown *unk) IOleObject_Release(oleobj); } +static void test_Navigate2(IUnknown *unk) +{ + IWebBrowser2 *webbrowser; + VARIANT url; + HRESULT hres; + + static const WCHAR wszAboutBlank[] = + {'a','b','o','u','t',':','b','l','a','n','k',0}; + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&webbrowser); + ok(hres == S_OK, "QueryInterface(IID_IWebBrowser) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = SysAllocString(wszAboutBlank); + + SET_EXPECT(Invoke_AMBIENT_USERMODE); + SET_EXPECT(EnableModeless_FALSE); + SET_EXPECT(GetHostInfo); + SET_EXPECT(Invoke_AMBIENT_DLCONTROL); + SET_EXPECT(Invoke_AMBIENT_USERAGENT); + SET_EXPECT(Invoke_AMBIENT_PALETTE); + SET_EXPECT(GetOptionKeyPath); + SET_EXPECT(GetOverridesKeyPath); + SET_EXPECT(SetStatusText); + SET_EXPECT(EnableModeless_TRUE); + + hres = IWebBrowser2_Navigate2(webbrowser, &url, NULL, NULL, NULL, NULL); + ok(hres == S_OK, "Navigate2 failed: %08x\n", hres); + + CHECK_CALLED(Invoke_AMBIENT_USERMODE); + CHECK_CALLED(EnableModeless_FALSE); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); + CHECK_CALLED(Invoke_AMBIENT_USERAGENT); + CHECK_CALLED(Invoke_AMBIENT_PALETTE); + CHECK_CALLED(GetOptionKeyPath); + CHECK_CALLED(GetOverridesKeyPath); + CHECK_CALLED(SetStatusText); + CHECK_CALLED(EnableModeless_TRUE); + + IWebBrowser2_Release(webbrowser); +} + static void test_QueryInterface(IUnknown *unk) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; @@ -1289,6 +1383,7 @@ static void test_WebBrowser(void) test_Extent(unk); test_wb_funcs(unk, TRUE); test_DoVerb(unk); + test_Navigate2(unk); test_ClientSite(unk, NULL); test_ie_funcs(unk); test_GetControlInfo(unk); @@ -1298,8 +1393,40 @@ static void test_WebBrowser(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void gecko_installer_workaround(BOOL disable) +{ + HKEY hkey; + DWORD res; + + static BOOL has_url = FALSE; + static char url[2048]; + + if(!disable && !has_url) + return; + + res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); + if(res != ERROR_SUCCESS) + return; + + if(disable) { + DWORD type, size = sizeof(url); + + res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); + if(res == ERROR_SUCCESS && type == REG_SZ) + has_url = TRUE; + + RegDeleteValue(hkey, "GeckoUrl"); + }else { + RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); + } + + RegCloseKey(hkey); +} + START_TEST(webbrowser) { + gecko_installer_workaround(TRUE); + container_hwnd = create_container_window(); OleInitialize(NULL); @@ -1307,4 +1434,6 @@ START_TEST(webbrowser) test_WebBrowser(); OleUninitialize(); + + gecko_installer_workaround(FALSE); }

1 0

Jacek Caban : shdocvw: Call EnableModeless and SetStatusText in navigate.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: a01a20c09046c17e2ea0a094ecdc7e99de336533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01a20c09046c17e2ea0a094e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:56:57 2007 +0100 shdocvw: Call EnableModeless and SetStatusText in navigate. --- dlls/shdocvw/navigate.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index a7b05b5..161c138 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -450,13 +450,19 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) if(FAILED(hres)) return hres; - if(FAILED(hres)) { - IPersistMoniker_Release(persist); - return hres; - } + if(This->frame) + IOleInPlaceFrame_EnableModeless(This->frame, FALSE); /* FIXME */ hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); IPersistMoniker_Release(persist); + + if(This->frame) { + static const WCHAR empty[] = {0}; + + IOleInPlaceFrame_SetStatusText(This->frame, empty); /* FIXME */ + IOleInPlaceFrame_EnableModeless(This->frame, TRUE); /* FIXME */ + } + if(FAILED(hres)) { WARN("Load failed: %08x\n", hres); return hres;

1 0

Jacek Caban : shdocvw: Move frame variable to DocHost.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: dc15020cf527b4f2e865e40d80e4a4ce8207aa03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc15020cf527b4f2e865e40d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:56:02 2007 +0100 shdocvw: Move frame variable to DocHost. --- dlls/shdocvw/dochost.c | 3 +++ dlls/shdocvw/oleobject.c | 17 +++++++---------- dlls/shdocvw/shdocvw.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index c170a4a..f26447d 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -490,6 +490,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp) This->document = NULL; This->hostui = NULL; + This->frame = NULL; This->hwnd = NULL; This->frame_hwnd = NULL; @@ -508,6 +509,8 @@ void DocHost_Release(DocHost *This) { if(This->client_disp) IDispatch_Release(This->client_disp); + if(This->frame) + IOleInPlaceFrame_Release(This->frame); DocHost_ClientSite_Release(This); diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 17f740a..aa1edfe 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -138,7 +138,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) IOleInPlaceSite_OnInPlaceActivate(This->inplace); - IOleInPlaceSite_GetWindowContext(This->inplace, &This->frame, &This->uiwindow, + IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow, &This->pos_rect, &This->clip_rect, &This->frameinfo); @@ -153,8 +153,8 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) IOleClientSite_GetContainer(This->client, &This->container); } - if(This->frame) - IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + if(This->doc_host.frame) + IOleInPlaceFrame_GetWindow(This->doc_host.frame, &This->frame_hwnd); return S_OK; } @@ -174,13 +174,13 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) IOleInPlaceSite_OnUIActivate(This->inplace); - if(This->frame) - IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + if(This->doc_host.frame) + IOleInPlaceFrame_SetActiveObject(This->doc_host.frame, ACTIVEOBJ(This), wszitem); if(This->uiwindow) IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem); - if(This->frame) - IOleInPlaceFrame_SetMenu(This->frame, NULL, NULL, This->shell_embedding_hwnd); + if(This->doc_host.frame) + IOleInPlaceFrame_SetMenu(This->doc_host.frame, NULL, NULL, This->shell_embedding_hwnd); SetFocus(This->shell_embedding_hwnd); @@ -886,7 +886,6 @@ void WebBrowser_OleObject_Init(WebBrowser *This) This->inplace = NULL; This->container = NULL; This->frame_hwnd = NULL; - This->frame = NULL; This->uiwindow = NULL; This->shell_embedding_hwnd = NULL; @@ -904,8 +903,6 @@ void WebBrowser_OleObject_Destroy(WebBrowser *This) IOleObject_SetClientSite(OLEOBJ(This), NULL); if(This->container) IOleContainer_Release(This->container); - if(This->frame) - IOleInPlaceFrame_Release(This->frame); if(This->uiwindow) IOleInPlaceUIWindow_Release(This->uiwindow); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0f897e7..5704156 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -76,6 +76,7 @@ typedef struct { IDispatch *client_disp; IDocHostUIHandler *hostui; + IOleInPlaceFrame *frame; IUnknown *document; IOleDocumentView *view; @@ -117,7 +118,6 @@ struct WebBrowser { /* window context */ HWND frame_hwnd; - IOleInPlaceFrame *frame; IOleInPlaceUIWindow *uiwindow; RECT pos_rect; RECT clip_rect;

1 0

Jacek Caban : shdocvw: Release callback and bindctx in bind_url_to_object.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 3febaa2d137af41286c49419b216fb84d85231ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3febaa2d137af41286c49419b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:55:07 2007 +0100 shdocvw: Release callback and bindctx in bind_url_to_object. --- dlls/shdocvw/navigate.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 3d3ff61..a7b05b5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -413,8 +413,7 @@ static BOOL try_application_url(LPCWSTR url) return ShellExecuteExW(&exec_info); } -static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx, - IBindStatusCallback *callback) +static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) { IOleObject *oleobj; IPersistMoniker *persist; @@ -499,9 +498,11 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); CreateAsyncBindCtx(0, callback, 0, &bindctx); + IBindStatusCallback_Release(callback); - hres = navigate(This, mon, bindctx, callback); + hres = navigate(This, mon, bindctx); + IBindCtx_Release(bindctx); IMoniker_Release(mon); return hres; @@ -602,7 +603,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, This->url = url; - return navigate(This, mon, bindctx, callback); + return navigate(This, mon, bindctx); } #define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface)

1 0

Jacek Caban : shdocvw: Added mode dispids implementation in DocHost::Invoke .
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 72bf4a641e614674a09bad9e9ba451007e8951f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bf4a641e614674a09bad9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:50:01 2007 +0100 shdocvw: Added mode dispids implementation in DocHost::Invoke. --- dlls/shdocvw/client.c | 8 ++++++++ dlls/shdocvw/dochost.c | 5 +++++ dlls/shdocvw/oleobject.c | 3 +++ dlls/shdocvw/shdocvw.h | 4 +++- 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index c2d71cf..c74918a 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -433,6 +433,14 @@ static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, R debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); switch(dispIdMember) { + case DISPID_AMBIENT_USERMODE: + case DISPID_AMBIENT_DLCONTROL: + case DISPID_AMBIENT_USERAGENT: + case DISPID_AMBIENT_PALETTE: + if(!This->client_disp) + return E_FAIL; + return IDispatch_Invoke(This->client_disp, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = This->offline; diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6d51f2e..c170a4a 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -486,6 +486,8 @@ void DocHost_Init(DocHost *This, IDispatch *disp) This->disp = disp; + This->client_disp = NULL; + This->document = NULL; This->hostui = NULL; @@ -504,6 +506,9 @@ void DocHost_Init(DocHost *This, IDispatch *disp) void DocHost_Release(DocHost *This) { + if(This->client_disp) + IDispatch_Release(This->client_disp); + DocHost_ClientSite_Release(This); ConnectionPointContainer_Destroy(&This->cps); diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 307fe0b..17f740a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -307,6 +307,9 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE IOleClientSite_AddRef(pClientSite); + IOleClientSite_QueryInterface(This->client, &IID_IDispatch, + (void**)&This->doc_host.client_disp); + IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, (void**)&This->doc_host.hostui); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 78b43d2..0f897e7 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -74,9 +74,11 @@ typedef struct { IDispatch *disp; + IDispatch *client_disp; + IDocHostUIHandler *hostui; + IUnknown *document; IOleDocumentView *view; - IDocHostUIHandler *hostui; HWND hwnd; HWND frame_hwnd;

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007