November 2010 - Wine-commits

David Hedberg : shdocvw: Add IOleControlSite interface to dochost.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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

David Hedberg : shdocvw: Implement ControlSite::TranslateAccelerator.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 0adfeb28696aacf426977c578012bfa84e257cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adfeb28696aacf426977c578… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Nov 17 13:12:21 2010 +0100 shdocvw: Implement ControlSite::TranslateAccelerator. --- dlls/shdocvw/client.c | 27 ++++++++- dlls/shdocvw/tests/webbrowser.c | 125 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index bb569aa..5c5da44 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -415,8 +415,31 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M DWORD grfModifiers) { DocHost *This = impl_from_IOleControlSite(iface); - FIXME("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); - return E_NOTIMPL; + IOleObject *wb_obj; + IOleClientSite *clientsite; + IOleControlSite *controlsite; + HRESULT hr; + + TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); + + hr = IDispatch_QueryInterface(This->disp, &IID_IOleObject, (void**)&wb_obj); + if(SUCCEEDED(hr)) { + hr = IOleObject_GetClientSite(wb_obj, &clientsite); + if(SUCCEEDED(hr)) { + hr = IOleClientSite_QueryInterface(clientsite, &IID_IOleControlSite, (void**)&controlsite); + if(SUCCEEDED(hr)) { + hr = IOleControlSite_TranslateAccelerator(controlsite, pMsg, grfModifiers); + IOleControlSite_Release(controlsite); + } + IOleClientSite_Release(clientsite); + } + IOleObject_Release(wb_obj); + } + + if(FAILED(hr)) + return S_FALSE; + else + return hr; } static HRESULT WINAPI ControlSite_OnFocus(IOleControlSite *iface, BOOL fGotFocus) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 7f9a24a..6f84eee 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -130,6 +130,8 @@ DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(ShowUI); DEFINE_EXPECT(HideUI); DEFINE_EXPECT(RequestUIActivate); +DEFINE_EXPECT(ControlSite_TranslateAccelerator); +DEFINE_EXPECT(OnFocus); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -140,6 +142,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 HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 @@ -852,6 +855,85 @@ static const IOleClientSiteVtbl ClientSiteVtbl = { static IOleClientSite ClientSite = { &ClientSiteVtbl }; +static HRESULT WINAPI IOleControlSite_fnQueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI IOleControlSite_fnAddRef(IOleControlSite *iface) +{ + return 2; +} + +static ULONG WINAPI IOleControlSite_fnRelease(IOleControlSite *iface) +{ + return 1; +} + +static HRESULT WINAPI IOleControlSite_fnOnControlInfoChanged(IOleControlSite* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnLockInPlaceActive(IOleControlSite* This, + BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnGetExtendedControl(IOleControlSite* This, + IDispatch **ppDisp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnTransformCoords(IOleControlSite* This, + POINTL *pPtlHimetric, + POINTF *pPtfContainer, + DWORD dwFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnTranslateAccelerator(IOleControlSite* This, MSG *pMsg, + DWORD grfModifiers) +{ + CHECK_EXPECT(ControlSite_TranslateAccelerator); + return hr_site_TranslateAccelerator; +} + +static HRESULT WINAPI IOleControlSite_fnOnFocus(IOleControlSite* This, BOOL fGotFocus) +{ + CHECK_EXPECT2(OnFocus); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleControlSite_fnShowPropertyFrame(IOleControlSite* This) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IOleControlSiteVtbl ControlSiteVtbl = { + IOleControlSite_fnQueryInterface, + IOleControlSite_fnAddRef, + IOleControlSite_fnRelease, + IOleControlSite_fnOnControlInfoChanged, + IOleControlSite_fnLockInPlaceActive, + IOleControlSite_fnGetExtendedControl, + IOleControlSite_fnTransformCoords, + IOleControlSite_fnTranslateAccelerator, + IOleControlSite_fnOnFocus, + IOleControlSite_fnShowPropertyFrame +}; + +static IOleControlSite ControlSite = { &ControlSiteVtbl }; + static HRESULT WINAPI InPlaceUIWindow_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) { @@ -1433,7 +1515,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) trace("interface IID_IDocHostShowUI\n"); else if(IsEqualGUID(&IID_IOleControlSite, riid)) - trace("interface IID_IOleControlSite\n"); + *ppv = &ControlSite; else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) trace("interface IID_IOleCommandTarget\n"); @@ -1494,6 +1576,7 @@ static void test_DoVerb(IUnknown *unk) SET_EXPECT(Frame_SetActiveObject); SET_EXPECT(UIWindow_SetActiveObject); SET_EXPECT(SetMenu); + SET_EXPECT(OnFocus); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -1510,6 +1593,7 @@ static void test_DoVerb(IUnknown *unk) CHECK_CALLED(Frame_SetActiveObject); CHECK_CALLED(UIWindow_SetActiveObject); CHECK_CALLED(SetMenu); + todo_wine CHECK_CALLED(OnFocus); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -2539,6 +2623,7 @@ static void test_TranslateAccelerator(IUnknown *unk) ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { IDocHostUIHandler2 *dochost; + IOleControlSite *doc_controlsite; IUnknown *unk_test; hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleInPlaceFrame, (void**)&unk_test); @@ -2575,6 +2660,44 @@ static void test_TranslateAccelerator(IUnknown *unk) IDocHostUIHandler2_Release(dochost); } + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleControlSite, (void**)&doc_controlsite); + ok(hres == S_OK, "Got 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + + msg_a.message = WM_KEYDOWN; + hr_site_TranslateAccelerator = 0xdeadbeef; + for(keycode = 0; keycode < 0x100; keycode++) { + msg_a.wParam = keycode; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + if(keycode == 0x9 || keycode == 0x75) + todo_wine ok(hres == S_OK, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + else + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + + CHECK_CALLED(ControlSite_TranslateAccelerator); + } + msg_a.wParam = VK_LEFT; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + hr_site_TranslateAccelerator = S_OK; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_OK, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + hr_site_TranslateAccelerator = E_NOTIMPL; + SET_EXPECT(ControlSite_TranslateAccelerator); + hres = IOleControlSite_TranslateAccelerator(doc_controlsite, &msg_a, 0); + ok(hres == S_FALSE, "Got 0x%08x (keycode: %04x)\n", hres, keycode); + CHECK_CALLED(ControlSite_TranslateAccelerator); + + IOleControlSite_Release(doc_controlsite); + } + IOleClientSite_Release(doc_clientsite); } IOleObject_Release(obj_doc);

1 0

David Hedberg : shdocvw: Implement InPlaceActiveObject:: TranslateAccelerator.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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 : msxml3: Fix incorrect uses of va_list arguments.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: d70b3e592922a2f361bd558a4ee9fbd1e6aed4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70b3e592922a2f361bd558a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:21:09 2010 +0100 msxml3: Fix incorrect uses of va_list arguments. --- dlls/msxml3/main.c | 42 ++++++++++++++++++++++++------------------ dlls/msxml3/msxml_private.h | 4 ++-- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 49ef6fa..1201d2b 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -61,29 +61,35 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, break; } - if (ap) + do { - do - { - heap_free(buf); - buf = heap_alloc(len); - needed = vsnprintf(buf, len, msg, ap); - if (needed == -1) - len *= 2; - else if (needed >= len) - len = needed + 1; - else - needed = 0; - } - while (needed); - - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, buf); heap_free(buf); + buf = heap_alloc(len); + needed = vsnprintf(buf, len, msg, ap); + if (needed == -1) + len *= 2; + else if (needed >= len) + len = needed + 1; + else + needed = 0; } - else + while (needed); + + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buf); + heap_free(buf); +} + +void wineXmlCallbackError(char const* caller, xmlErrorPtr err) +{ + enum __wine_debug_class dbcl; + + switch (err->level) { - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, msg); + case XML_ERR_NONE: dbcl = __WINE_DBCL_TRACE; break; + case XML_ERR_WARNING: dbcl = __WINE_DBCL_WARN; break; + default: dbcl = __WINE_DBCL_ERR; break; } + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", err->message); } /* Support for loading xml files from a Wine Windows drive */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9980fdd..f3faa8a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -209,6 +209,7 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap); +extern void wineXmlCallbackError(char const* caller, xmlErrorPtr err); #define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) @@ -221,8 +222,7 @@ extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const #define LIBXML2_CALLBACK_ERR(caller, msg, ap) \ wineXmlCallbackLog(#caller, XML_ERR_ERROR, msg, ap) -#define LIBXML2_CALLBACK_SERROR(caller, err) \ - wineXmlCallbackLog(#caller, err->level, err->message, NULL) +#define LIBXML2_CALLBACK_SERROR(caller, err) wineXmlCallbackError(#caller, err) extern BOOL is_preserving_whitespace(xmlNodePtr node);

1 0

Alexandre Julliard : libwine: Fix a pointer comparison warning.
by Alexandre Julliard 17 Nov '10

17 Nov '10

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

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

17 Nov '10

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 17 Nov '10

17 Nov '10

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

Alexandre Julliard : oleaut32: Fix the overflow check in VarNumFromParseNum .
by Alexandre Julliard 17 Nov '10

17 Nov '10

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

Michael Stefaniuc : msxml3: Remove 'const' from the function return types.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 2b1e03369d4693e0a539b457f65c094aa3aeb36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1e03369d4693e0a539b457f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 17 12:13:17 2010 +0100 msxml3: Remove 'const' from the function return types. Type qualifiers have only a meaning for lvalues. --- dlls/msxml3/xdr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index 3f1bad5..6e0da94 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -128,7 +128,7 @@ static inline xmlNodePtr get_schema(xmlNodePtr node) return xmlDocGetRootElement(node->doc); } -static inline const xmlNodePtr get_child(xmlNodePtr node, xmlChar const* name) +static inline xmlNodePtr get_child(xmlNodePtr node, xmlChar const* name) { xmlNodePtr child = NULL; if (node) @@ -143,9 +143,9 @@ static inline const xmlNodePtr get_child(xmlNodePtr node, xmlChar const* name) return child; } -static inline const xmlNodePtr get_child_with_attr(xmlNodePtr node, xmlChar const* name, - xmlChar const* attr_ns, xmlChar const* attr_name, - xmlChar const* attr_val) +static inline xmlNodePtr get_child_with_attr(xmlNodePtr node, xmlChar const* name, + xmlChar const* attr_ns, xmlChar const* attr_name, + xmlChar const* attr_val) { xmlChar* str; if (node)

1 0

Henri Verbeet : wined3d: Send a notification that the GL texture changed in flip_surface().
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: faba8d734d70d821451ffd7c44bae96e06902a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faba8d734d70d821451ffd7c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 17 12:38:57 2010 +0100 wined3d: Send a notification that the GL texture changed in flip_surface(). Strictly speaking the texture doesn't get unloaded, but it does get associated with a different surface. The FBO cache in particular is much happier when it gets notified of these. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa715b1..432eb9b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2710,6 +2710,9 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { tmp = back->texture_name_srgb; back->texture_name_srgb = front->texture_name_srgb; front->texture_name_srgb = tmp; + + resource_unload((IWineD3DResourceImpl *)back); + resource_unload((IWineD3DResourceImpl *)front); } {

1 0