November 2010 - Wine-Commits

David Hedberg : shdocvw: Implement InPlaceActiveObject:: TranslateAccelerator.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 155877e4fffc6866fd39cf2270ca7285a2c32680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155877e4fffc6866fd39cf227… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:22 2010 +0100 shdocvw: Implement InPlaceActiveObject::TranslateAccelerator. --- dlls/shdocvw/oleobject.c | 20 +++++++- dlls/shdocvw/tests/webbrowser.c | 94 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 4a777d0..923107f 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -830,8 +830,24 @@ static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActive LPMSG lpmsg) { WebBrowser *This = impl_from_IOleInPlaceActiveObject(iface); - FIXME("(%p)->(%p)\n", This, lpmsg); - return E_NOTIMPL; + IOleInPlaceActiveObject *activeobj; + HRESULT hr = S_FALSE; + + TRACE("(%p)->(%p)\n", This, lpmsg); + + if(This->doc_host.document) { + if(SUCCEEDED(IUnknown_QueryInterface(This->doc_host.document, + &IID_IOleInPlaceActiveObject, + (void**)&activeobj))) { + hr = IOleInPlaceActiveObject_TranslateAccelerator(activeobj, lpmsg); + IOleInPlaceActiveObject_Release(activeobj); + } + } + + if(SUCCEEDED(hr)) + return hr; + else + return S_FALSE; } static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 6f84eee..8f0902f 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -337,6 +337,13 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID default: ok(0, "unexpected nCmdID %d of CGID_DocHostCmdPriv\n", nCmdID); } + }else if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + switch(nCmdID) { + case 6041: /* TODO */ + break; + default: + ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); + } }else { ok(0, "unexpected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); } @@ -2598,8 +2605,48 @@ static void test_QueryInterface(IUnknown *unk) } +static void test_UIActivate(IUnknown *unk, BOOL activate) +{ + IOleDocumentView *docview; + IDispatch *disp; + HRESULT hres; + + disp = get_document(unk); + + hres = IDispatch_QueryInterface(disp, &IID_IOleDocumentView, (void**)&docview); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + if(activate) { + SET_EXPECT(RequestUIActivate); + SET_EXPECT(ShowUI); + SET_EXPECT(HideUI); + SET_EXPECT(OnFocus); + } + + hres = IOleDocumentView_UIActivate(docview, activate); + if(activate) + todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); + else + ok(hres == S_OK, "Got 0x%08x\n", hres); + + if(activate) { + todo_wine { + CHECK_CALLED(RequestUIActivate); + CHECK_CALLED(ShowUI); + CHECK_CALLED(HideUI); + CHECK_CALLED(OnFocus); + } + } + + IOleDocumentView_Release(docview); + } + + IDispatch_Release(disp); +} + static void test_TranslateAccelerator(IUnknown *unk) { + IOleInPlaceActiveObject *pao; IOleObject *obj_doc; IDispatch *disp_doc; HRESULT hres; @@ -2613,6 +2660,51 @@ static void test_TranslateAccelerator(IUnknown *unk) test_Navigate2(unk); + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + /* One accelerator that should be handled by mshtml */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F1; + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + + /* And one that should not */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F5; + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + + IOleInPlaceActiveObject_Release(pao); + } + + test_UIActivate(unk, TRUE); + + /* Test again after UIActivate */ + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + /* One accelerator that should be handled by mshtml */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F1; + SET_EXPECT(DocHost_TranslateAccelerator); + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + ok(hres == S_FALSE, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + todo_wine CHECK_CALLED(DocHost_TranslateAccelerator); + todo_wine CHECK_CALLED(ControlSite_TranslateAccelerator); + + /* And one that should not */ + msg_a.message = WM_KEYDOWN; + msg_a.wParam = VK_F5; + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IOleInPlaceActiveObject_TranslateAccelerator(pao, &msg_a); + todo_wine ok(hres == S_OK, "Got 0x%08x (%04x::%02lx)\n", hres, msg_a.message, msg_a.wParam); + todo_wine CHECK_CALLED(DocHost_TranslateAccelerator); + + IOleInPlaceActiveObject_Release(pao); + } + disp_doc = get_document(unk); hres = IDispatch_QueryInterface(disp_doc, &IID_IOleObject, (void**)&obj_doc); ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2704,6 +2796,8 @@ static void test_TranslateAccelerator(IUnknown *unk) } IDispatch_Release(disp_doc); + + test_UIActivate(unk, FALSE); } static void test_WebBrowser(BOOL do_download)

1 0

Alexandre Julliard : libwine: Fix a pointer comparison warning.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 7a7b60098f0eb68d3546792a77859eaf110eb056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7b60098f0eb68d3546792a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 15:07:30 2010 +0100 libwine: Fix a pointer comparison warning. --- libs/wine/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 6c2324d..df0a6b5 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -691,7 +691,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) * of the address space causes subsequent execs to fail, even on the * child side of a fork. Avoid the top 16MB. */ char * const limit = (char*)0xff000000; - if (base >= limit) return 0; + if ((char *)base >= limit) return 0; if (size > limit - (char*)base) size = limit - (char*)base; if (size < info->desired_size) return 0;

1 0

Maarten Lankhorst : winegstreamer: Fix reference leak.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: f3481b0218a30fe49af245183fd89c7ebbefac40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3481b0218a30fe49af245183… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 17 13:25:51 2010 +0100 winegstreamer: Fix reference leak. --- dlls/winegstreamer/gstdemux.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0af7014..a53355d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1556,6 +1556,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { gst_element_set_bus(This->gstfilter, NULL); gst_element_set_state(This->gstfilter, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); + gst_object_unref(This->my_src); This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; i++) {

1 0

David Hedberg : shdocvw: Implement DocHostUIHandler::TranslateAccelerator.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 910cac49a464fea8633488511f033b7adcd6ef70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910cac49a464fea8633488511… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:19 2010 +0100 shdocvw: Implement DocHostUIHandler::TranslateAccelerator. --- dlls/shdocvw/dochost.c | 9 +++- dlls/shdocvw/tests/webbrowser.c | 89 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index e7c8c0f..31ecce3 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -620,8 +620,13 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 * LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID) { DocHost *This = impl_from_IDocHostUIHandler2(iface); - FIXME("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID); - return E_NOTIMPL; + HRESULT hr = S_FALSE; + TRACE("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID); + + if(This->hostui) + hr = IDocHostUIHandler_TranslateAccelerator(This->hostui, lpMsg, pguidCmdGroup, nCmdID); + + return hr; } static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1b1afc1..7f9a24a 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -124,8 +124,12 @@ DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); DEFINE_EXPECT(DocHost_EnableModeless_FALSE); +DEFINE_EXPECT(DocHost_TranslateAccelerator); DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(TranslateUrl); +DEFINE_EXPECT(ShowUI); +DEFINE_EXPECT(HideUI); +DEFINE_EXPECT(RequestUIActivate); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -135,6 +139,7 @@ static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, is_first_load; +static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static const char *current_url; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -1140,7 +1145,7 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivateEx(IOleInPlaceSiteEx *iface static HRESULT WINAPI InPlaceSite_RequestUIActivate(IOleInPlaceSiteEx *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT2(RequestUIActivate); return S_OK; } @@ -1207,13 +1212,13 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget, IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(ShowUI); return E_NOTIMPL; } static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(HideUI); return E_NOTIMPL; } @@ -1255,8 +1260,12 @@ static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, L static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *iface, LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(DocHost_TranslateAccelerator); + ok(pguidCmdGroup != NULL, "Got NULL pguidCmdGroup.\n"); + if(pguidCmdGroup) + ok(IsEqualGUID(pguidCmdGroup, &CGID_MSHTML), "Unexpected pguidCmdGroup\n"); + ok(lpMsg != NULL, "Got NULL lpMsg.\n"); + return hr_dochost_TranslateAccelerator; } static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *iface, @@ -2505,6 +2514,75 @@ static void test_QueryInterface(IUnknown *unk) } +static void test_TranslateAccelerator(IUnknown *unk) +{ + IOleObject *obj_doc; + IDispatch *disp_doc; + HRESULT hres; + DWORD keycode; + MSG msg_a = { + container_hwnd, + 0, 0, 0, + GetTickCount(), + {5, 5} + }; + + test_Navigate2(unk); + + disp_doc = get_document(unk); + hres = IDispatch_QueryInterface(disp_doc, &IID_IOleObject, (void**)&obj_doc); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + IOleClientSite *doc_clientsite; + + hres = IOleObject_GetClientSite(obj_doc, &doc_clientsite); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + IDocHostUIHandler2 *dochost; + IUnknown *unk_test; + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleInPlaceFrame, (void**)&unk_test); + ok(hres == E_NOINTERFACE, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostShowUI, (void**)&unk_test); + todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostUIHandler, (void**)&unk_test); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) IUnknown_Release(unk_test); + + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IDocHostUIHandler2, (void**)&dochost); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + + msg_a.message = WM_KEYDOWN; + hr_dochost_TranslateAccelerator = 0xdeadbeef; + for(keycode = 0; keycode <= 0x100; keycode++) { + msg_a.wParam = keycode; + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + ok(hres == 0xdeadbeef, "Got 0x%08x\n", hres); + CHECK_CALLED(DocHost_TranslateAccelerator); + } + hr_dochost_TranslateAccelerator = E_NOTIMPL; + + SET_EXPECT(DocHost_TranslateAccelerator); + hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + ok(hres == E_NOTIMPL, "Got 0x%08x\n", hres); + CHECK_CALLED(DocHost_TranslateAccelerator); + + IDocHostUIHandler2_Release(dochost); + } + IOleClientSite_Release(doc_clientsite); + } + IOleObject_Release(obj_doc); + } + + IDispatch_Release(disp_doc); +} + static void test_WebBrowser(BOOL do_download) { IUnknown *unk = NULL; @@ -2559,6 +2637,7 @@ static void test_WebBrowser(BOOL do_download) test_Navigate2(unk); test_download(DWL_EXPECT_BEFORE_NAVIGATE); + test_TranslateAccelerator(unk); doc2 = get_document(unk); ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2);

1 0

David Hedberg : shdocvw: Add IOleControlSite interface to dochost.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 42ef5a0fce16e003e9679e16771873a19c100ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ef5a0fce16e003e9679e167… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:20 2010 +0100 shdocvw: Add IOleControlSite interface to dochost. --- dlls/shdocvw/client.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 1 + 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index dfb6d34..bb569aa 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -55,6 +55,9 @@ static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID ri }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); *ppv = &This->IOleDocumentSite_iface; + }else if(IsEqualGUID(&IID_IOleControlSite, riid)) { + TRACE("(%p)->(IID_IOleControlSite %p)\n", This, ppv); + *ppv = &This->IOleControlSite_iface; }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); *ppv = &This->IOleCommandTarget_iface; @@ -356,6 +359,93 @@ static const IOleDocumentSiteVtbl OleDocumentSiteVtbl = { OleDocumentSite_ActivateMe }; +static inline DocHost *impl_from_IOleControlSite(IOleControlSite *iface) +{ + return (DocHost*)((char*)iface - FIELD_OFFSET(DocHost, IOleControlSite_iface)); +} + +static HRESULT WINAPI ControlSite_QueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + DocHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI ControlSite_AddRef(IOleControlSite *iface) +{ + DocHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI ControlSite_Release(IOleControlSite *iface) +{ + DocHost *This = impl_from_IOleControlSite(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI ControlSite_OnControlInfoChanged(IOleControlSite *iface) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_LockInPlaceActive(IOleControlSite *iface, BOOL fLock) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%d)\n", This, fLock); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_GetExtendedControl(IOleControlSite *iface, IDispatch **ppDisp) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p)\n", This, ppDisp); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_TransformCoords(IOleControlSite *iface, POINTL *pPtlHimetric, + POINTF *pPtfContainer, DWORD dwFlags) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p, %p, %08x)\n", This, pPtlHimetric, pPtfContainer, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, MSG *pMsg, + DWORD grfModifiers) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)->(%d)\n", This, fGotFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI ControlSite_ShowPropertyFrame(IOleControlSite *iface) +{ + DocHost *This = impl_from_IOleControlSite(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static IOleControlSiteVtbl OleControlSiteVtbl = { + ControlSite_QueryInterface, + ControlSite_AddRef, + ControlSite_Release, + ControlSite_OnControlInfoChanged, + ControlSite_LockInPlaceActive, + ControlSite_GetExtendedControl, + ControlSite_TransformCoords, + ControlSite_TranslateAccelerator, + ControlSite_OnFocus, + ControlSite_ShowPropertyFrame +}; + static inline DocHost *impl_from_IDispatch(IDispatch *iface) { return (DocHost*)((char*)iface - FIELD_OFFSET(DocHost, IDispatch_iface)); @@ -521,6 +611,7 @@ void DocHost_ClientSite_Init(DocHost *This) This->IOleClientSite_iface.lpVtbl = &OleClientSiteVtbl; This->IOleInPlaceSite_iface.lpVtbl = &OleInPlaceSiteVtbl; This->IOleDocumentSite_iface.lpVtbl = &OleDocumentSiteVtbl; + This->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; This->IDispatch_iface.lpVtbl = &DispatchVtbl; This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index bd6152d..6df8527 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -97,6 +97,7 @@ struct DocHost { IOleInPlaceSite IOleInPlaceSite_iface; IDocHostUIHandler2 IDocHostUIHandler2_iface; IOleDocumentSite IOleDocumentSite_iface; + IOleControlSite IOleControlSite_iface; IOleCommandTarget IOleCommandTarget_iface; IDispatch IDispatch_iface; IPropertyNotifySink IPropertyNotifySink_iface;

1 0

Alexandre Julliard : oleaut32: Fix the overflow check in VarNumFromParseNum .
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 4e94fd55676675a89ad46ca3d1fa3e8ef54b55b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e94fd55676675a89ad46ca3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 13:42:50 2010 +0100 oleaut32: Fix the overflow check in VarNumFromParseNum. Spotted by Adam Martinson. --- dlls/oleaut32/tests/vartype.c | 4 +++- dlls/oleaut32/variant.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index fe089bd..279fd7b 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2592,7 +2592,9 @@ static void test_VarUI8FromStr(void) CONVERT_STR(VarUI8FromStr,"0",0); EXPECTI8(0); CONVERT_STR(VarUI8FromStr,"-1",0); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"2147483647",0); EXPECTI8(2147483647); - CONVERT_STR(VarUI8FromStr,"18446744073709551615",0); todo_wine EXPECTI864(0xFFFFFFFF,0xFFFFFFFF); + CONVERT_STR(VarUI8FromStr,"18446744073709551614",0); EXPECTI864(0xFFFFFFFF,0xFFFFFFFE); + CONVERT_STR(VarUI8FromStr,"18446744073709551615",0); EXPECTI864(0xFFFFFFFF,0xFFFFFFFF); + CONVERT_STR(VarUI8FromStr,"18446744073709551616",0); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"-1.5",LOCALE_NOUSEROVERRIDE); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"-0.6",LOCALE_NOUSEROVERRIDE); EXPECT_OVERFLOW; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 92a86fd..776c0e7 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2186,7 +2186,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, /* Convert the integer part of the number into a UI8 */ for (i = 0; i < wholeNumberDigits; i++) { - if (ul64 > (UI8_MAX / 10 - rgbDig[i])) + if (ul64 > UI8_MAX / 10 || (ul64 == UI8_MAX / 10 && rgbDig[i] > UI8_MAX % 10)) { TRACE("Overflow multiplying digits\n"); bOverflow = TRUE;

1 0

Henri Verbeet : ddraw/tests: Fix some failure messages.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: d3e2e84feb873eaf4490c255ea9d6ef14e7bb1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e2e84feb873eaf4490c255e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:39:00 2010 +0100 ddraw/tests: Fix some failure messages. --- dlls/ddraw/tests/visual.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index c756bac..2b4cf23 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -356,14 +356,14 @@ static void lighting_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed with %08x\n", hr); } - color = getPixelColor(device, 160, 360); /* lower left quad - unlit without normals */ - ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ - ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit width normals */ - ok(color == 0x000000ff, "Unlit quad width normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit width normals */ - ok(color == 0x00000000, "Lit quad width normals has color %08x\n", color); + color = getPixelColor(device, 160, 360); /* Lower left quad - unlit without normals */ + ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + color = getPixelColor(device, 160, 120); /* Upper left quad - lit without normals */ + ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 480, 360); /* Lower right quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + color = getPixelColor(device, 480, 120); /* Upper right quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned %08x\n", hr);

1 0

Adam Martinson : oleaut32/tests: Test VT_BSTR => VT_UI8 at upper limit.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 5d7aac8c38d8294fd1255706f2a134b8517c2893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7aac8c38d8294fd1255706f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 17 01:41:36 2010 -0600 oleaut32/tests: Test VT_BSTR => VT_UI8 at upper limit. --- dlls/oleaut32/tests/vartype.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 361342e..fe089bd 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2588,10 +2588,11 @@ static void test_VarUI8FromStr(void) CHECKPTR(VarUI8FromStr); - CONVERT_STR(VarUI8FromStr,NULL,0); EXPECT_MISMATCH; - CONVERT_STR(VarUI8FromStr,"0",0); EXPECTI8(0); - CONVERT_STR(VarUI8FromStr,"-1",0); EXPECT_OVERFLOW; - CONVERT_STR(VarUI8FromStr,"2147483647",0); EXPECTI8(2147483647); + CONVERT_STR(VarUI8FromStr,NULL,0); EXPECT_MISMATCH; + CONVERT_STR(VarUI8FromStr,"0",0); EXPECTI8(0); + CONVERT_STR(VarUI8FromStr,"-1",0); EXPECT_OVERFLOW; + CONVERT_STR(VarUI8FromStr,"2147483647",0); EXPECTI8(2147483647); + CONVERT_STR(VarUI8FromStr,"18446744073709551615",0); todo_wine EXPECTI864(0xFFFFFFFF,0xFFFFFFFF); CONVERT_STR(VarUI8FromStr,"-1.5",LOCALE_NOUSEROVERRIDE); EXPECT_OVERFLOW; CONVERT_STR(VarUI8FromStr,"-0.6",LOCALE_NOUSEROVERRIDE); EXPECT_OVERFLOW;

1 0

Henri Verbeet : d3d9/tests: Fix some failure messages.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 10ccba52e70a4f6898d030f7d3478a2b63c9ebc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ccba52e70a4f6898d030f7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:38:58 2010 +0100 d3d9/tests: Fix some failure messages. --- dlls/d3d9/tests/visual.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 887f302..9e5b9a0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -346,14 +346,14 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x\n", hr); } - color = getPixelColor(device, 160, 360); /* lower left quad - unlit without normals */ - ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ - ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit with normals */ - ok(color == 0x000000ff, "Unlit quad with normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit with normals */ - ok(color == 0x00000000, "Lit quad with normals has color %08x\n", color); + color = getPixelColor(device, 160, 360); /* Lower left quad - unlit without normals */ + ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + color = getPixelColor(device, 160, 120); /* Upper left quad - lit without normals */ + ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 480, 360); /* Lower left quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + color = getPixelColor(device, 480, 120); /* Upper left quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Henri Verbeet : d3d8/tests: Fix some failure messages.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: d2f23ff61ecf725566ae5cddc4ad827c4577d250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f23ff61ecf725566ae5cddc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:38:59 2010 +0100 d3d8/tests: Fix some failure messages. --- dlls/d3d8/tests/visual.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 6819134..a6a9c9b 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -275,14 +275,14 @@ static void lighting_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %#08x\n", hr); } - color = getPixelColor(device, 160, 360); /* lower left quad - unlit without normals */ - ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); - color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ - ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit width normals */ - ok(color == 0x000000ff, "Unlit quad width normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit width normals */ - ok(color == 0x00000000, "Lit quad width normals has color %08x\n", color); + color = getPixelColor(device, 160, 360); /* Lower left quad - unlit without normals */ + ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + color = getPixelColor(device, 160, 120); /* Upper left quad - lit without normals */ + ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 480, 360); /* Lower right quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + color = getPixelColor(device, 480, 120); /* Upper right quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0