December 2009 - Wine-commits

Stefan Dösinger : wined3d: Don' t render single buffered swapchains to a FBO.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 718e55b9a6b495c9bd802fbee96926bb8f86a8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718e55b9a6b495c9bd802fbee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 15 20:16:19 2009 +0100 wined3d: Don't render single buffered swapchains to a FBO. --- dlls/wined3d/device.c | 9 +++++++-- dlls/wined3d/swapchain.c | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e97fb7..9d603d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6527,8 +6527,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE RECT client_rect; GetClientRect(swapchain->win_handle, &client_rect); - if(swapchain->presentParms.BackBufferWidth != client_rect.right || - swapchain->presentParms.BackBufferHeight != client_rect.bottom) + if(!swapchain->presentParms.BackBufferCount) + { + TRACE("Single buffered rendering\n"); + swapchain->render_to_fbo = FALSE; + } + else if(swapchain->presentParms.BackBufferWidth != client_rect.right || + swapchain->presentParms.BackBufferHeight != client_rect.bottom ) { TRACE("Rendering to FBO. Backbuffer %ux%u, window %ux%u\n", swapchain->presentParms.BackBufferWidth, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7e6c71e..d2c7ef2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -739,6 +739,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface swapchain->presentParms = *present_parameters; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && present_parameters->BackBufferCount && (present_parameters->BackBufferWidth != client_rect.right || present_parameters->BackBufferHeight != client_rect.bottom)) {

1 0

Stefan Dösinger : wined3d: Fix VBO buffer usage.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8eeb513b1a0e7a4f7963612f0305850499c9ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eeb513b1a0e7a4f7963612f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 28 11:38:29 2009 +0100 wined3d: Fix VBO buffer usage. --- dlls/wined3d/buffer.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f6e89dd..ff1ebd7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -79,22 +79,17 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) } /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage. Because we always keep the local copy - * we never read from the vbo and can create a write only opengl buffer. - */ - switch(This->resource.usage & (WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC)) + * quite often even if they specify 0 usage. + */ + if(This->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; + } + else { - case WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC: - case WINED3DUSAGE_DYNAMIC: - TRACE("Gl usage = GL_STREAM_DRAW\n"); - gl_usage = GL_STREAM_DRAW_ARB; - break; - - case WINED3DUSAGE_WRITEONLY: - default: - TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; - break; + TRACE("Gl usage = GL_STREAM_DRAW\n"); + gl_usage = GL_STREAM_DRAW_ARB; } /* Reserve memory for the buffer. The amount of data won't change

1 0

Piotr Caban : mshtml: Added ViewObjectEx stub implementation.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: bffa74a1c3b540056775aefc42a7ebe153107b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffa74a1c3b540056775aefc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:45:34 2009 +0100 mshtml: Added ViewObjectEx stub implementation. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 7 ++-- dlls/mshtml/view.c | 73 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eb1c782..57d4fc6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1697,6 +1697,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2, %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { + TRACE("(%p)->(IID_IViewObjectEx, %p)\n", This, ppv); + *ppv = VIEWOBJEX(This); }else if(IsEqualGUID(&IID_IOleWindow, riid)) { TRACE("(%p)->(IID_IOleWindow, %p)\n", This, ppv); *ppv = OLEWIN(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4fb4c89..afd0bff 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -314,7 +314,7 @@ struct HTMLDocument { const IOleDocumentVtbl *lpOleDocumentVtbl; const IOleDocumentViewVtbl *lpOleDocumentViewVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; - const IViewObject2Vtbl *lpViewObject2Vtbl; + const IViewObjectExVtbl *lpViewObjectExVtbl; const IOleInPlaceObjectWindowlessVtbl *lpOleInPlaceObjectWindowlessVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; @@ -564,8 +564,9 @@ struct HTMLDocumentNode { #define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl) #define OLEWIN(x) ((IOleWindow*) &(x)->lpOleInPlaceActiveObjectVtbl) #define ACTOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) -#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObject2Vtbl) -#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObject2Vtbl) +#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectExVtbl) +#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectExVtbl) +#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectExVtbl) #define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define INPLACEWIN(x) ((IOleInPlaceObjectWindowless*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 271a167..f4c62a0 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -751,27 +751,27 @@ static const IOleDocumentViewVtbl OleDocumentViewVtbl = { * IViewObject implementation */ -#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObject2, iface) +#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObjectEx, iface) -static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppvObject) +static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppvObject) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); } -static ULONG WINAPI ViewObject_AddRef(IViewObject2 *iface) +static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_AddRef(HTMLDOC(This)); } -static ULONG WINAPI ViewObject_Release(IViewObject2 *iface) +static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_Release(HTMLDOC(This)); } -static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, +static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue) { @@ -781,7 +781,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, L return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, +static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -789,7 +789,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwDrawAs return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -797,28 +797,28 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze) +static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) +static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE* ptd, LPSIZEL lpsizel) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -826,9 +826,49 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwDrawAspe return E_NOTIMPL; } +static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAspect, + LPCRECT pRectBounds, POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p (%d %d) %d %p)\n", This, dwAspect, pRectBounds, ptlLoc.x, + ptlLoc.y, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspect, + LPCRECT pRectBounds, LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, + DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %d %p %p %p %p\n", This, dwAspect,lindex, ptd, + hicTargetDev, pExtentInfo, pSizel); + return E_NOTIMPL; +} + #undef VIEWOBJ_THIS -static const IViewObject2Vtbl ViewObjectVtbl = { +static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, ViewObject_Release, @@ -838,11 +878,16 @@ static const IViewObject2Vtbl ViewObjectVtbl = { ViewObject_Unfreeze, ViewObject_SetAdvise, ViewObject_GetAdvise, - ViewObject_GetExtent + ViewObject_GetExtent, + ViewObject_GetRect, + ViewObject_GetViewStatus, + ViewObject_QueryHitPoint, + ViewObject_QueryHitRect, + ViewObject_GetNaturalExtent }; void HTMLDocument_View_Init(HTMLDocument *This) { This->lpOleDocumentViewVtbl = &OleDocumentViewVtbl; - This->lpViewObject2Vtbl = &ViewObjectVtbl; + This->lpViewObjectExVtbl = &ViewObjectVtbl; }

1 0

Huw Davies : oleaut32: Fix memory leaks in the tests.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 487dc6b639fb4dbb89d7567e8299fc521e7d4b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=487dc6b639fb4dbb89d7567e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 09:56:54 2009 +0000 oleaut32: Fix memory leaks in the tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8f19294..a61c777 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3484,6 +3484,7 @@ static void test_VarDateChangeTypeEx(void) (!lstrcmpW(V_BSTR(&vDst), sz25570) || !lstrcmpW(V_BSTR(&vDst), sz25570_2)), "hres=0x%X, type=%d (should be VT_BSTR), *bstr=%s\n", hres, V_VT(&vDst), V_BSTR(&vDst) ? wtoascii(V_BSTR(&vDst)) : "?"); + VariantClear(&vDst); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); if (HAVE_OLEAUT32_LOCALES) @@ -3492,6 +3493,7 @@ static void test_VarDateChangeTypeEx(void) ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && V_BSTR(&vDst) && !lstrcmpW(V_BSTR(&vDst), sz25570Nls), "hres=0x%X, type=%d (should be VT_BSTR), *bstr=%s\n", hres, V_VT(&vDst), V_BSTR(&vDst) ? wtoascii(V_BSTR(&vDst)) : "?"); + VariantClear(&vDst); } } @@ -4780,7 +4782,8 @@ static void test_VarBoolCopy(void) ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && \ V_BSTR(&vDst) && !memcmp(V_BSTR(&vDst), str, sizeof(str)), \ "hres=0x%X, type=%d (should be VT_BSTR), *bstr='%c'\n", \ - hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?') + hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?'); \ + VariantClear(&vDst) static void test_VarBoolChangeTypeEx(void) {

1 0

Huw Davies : oleaut32: Fix a memory leak.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: d83cf1af0f6b4323000cc9bb4b400dfd92f6a290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83cf1af0f6b4323000cc9bb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:08:18 2009 +0000 oleaut32: Fix a memory leak. Found by Valgrind. --- dlls/oleaut32/variant.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 10bc8ed..56ab2b3 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2854,6 +2854,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) if (FAILED(rc)) return rc; rc = VarBstrCmp(V_BSTR(bstrv), V_BSTR(&rv), lcid, flags); + VariantClear(&rv); } else if (V_BSTR(bstrv) && *V_BSTR(bstrv)) { /* Non NULL nor empty BSTR */ /* If the BSTR is not a number the BSTR is greater */ @@ -2869,8 +2870,8 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) /* Numeric comparison, will be handled below. VARCMP_NULL used only to break out. */ rc = VARCMP_NULL; - VariantClear(&lv); - VariantClear(&rv); + VariantClear(&lv); + VariantClear(&rv); } else /* Empty or NULL BSTR */ rc = VARCMP_GT;

1 0

Huw Davies : shell32: Fix a memory leak in the tests.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 7078cfa76bf6f9aeec663b02cc050c607074da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7078cfa76bf6f9aeec663b02c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:21:55 2009 +0000 shell32: Fix a memory leak in the tests. Found by Valgrind. --- dlls/shell32/tests/shlfolder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e3bf191..31ae05a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -586,6 +586,7 @@ static void test_GetDisplayName(void) ok (!lstrcmpiW(wszTestFile, wszTestFile2), "GetDisplayNameOf returns incorrect path!\n"); } + ILFree(pidlTestFile); IShellFolder_Release(psfDesktop); IShellFolder_Release(psfPersonal); }

1 0

Huw Davies : riched20: Initialise window size.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8808fccd576ec956013fd671eb93410a7e4c62e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8808fccd576ec956013fd671e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 16 10:34:01 2009 +0000 riched20: Initialise window size. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3dc1133..2ae4f94 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2646,6 +2646,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hWnd = NULL; ed->hwndParent = NULL; + ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0;

1 0

Alexandre Julliard : user32/tests: Fix a number of message test failures on various Windows boxes.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: b51311d60c3d6965d8dc8aa4cd04a85fdba71f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51311d60c3d6965d8dc8aa4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 16 12:28:41 2009 +0100 user32/tests: Fix a number of message test failures on various Windows boxes. --- dlls/user32/tests/msg.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c67aa13..90ec5a0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -161,7 +161,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* Win9x: SWP_NOSENDCHANGING */ { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 1 }, { HCBT_SETFOCUS, hook }, @@ -268,7 +268,7 @@ static const struct message WmSWP_ResizeNoZOrder[] = { { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOACTIVATE, 0, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, /*SWP_NOZORDER|*/SWP_NOACTIVATE, 0, SWP_NOMOVE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|optional }, { WM_SIZE, sent|defwinproc|optional }, @@ -631,9 +631,10 @@ static const struct message WmHideOverlappedSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_SIZE, sent|optional }, /* XP doesn't send it */ { WM_MOVE, sent|optional }, /* XP doesn't send it */ - { WM_NCACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATE, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_NCACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATE, sent|wparam|optional, 0 }, + { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|optional|defwinproc, 1 }, @@ -1776,7 +1777,8 @@ static BOOL ignore_message( UINT message ) message == WM_GETOBJECT || message == WM_TIMECHANGE || message == WM_DISPLAYCHANGE || - message == WM_DEVICECHANGE); + message == WM_DEVICECHANGE || + message == WM_DWMNCRENDERINGCHANGED); } @@ -5384,6 +5386,7 @@ static void test_button_messages(void) UpdateWindow(hwnd); SetFocus(0); flush_events(); + SetFocus(0); flush_sequence(); log_all_parent_messages++; @@ -9324,17 +9327,21 @@ static void test_PeekMessage(void) skip( "queuing key events not supported\n" ); goto done; } - ok(qstatus == MAKELONG(QS_KEY, QS_KEY), + ok(qstatus == MAKELONG(QS_KEY, QS_KEY) || + /* keybd_event seems to trigger a sent message on NT4 */ + qstatus == MAKELONG(QS_KEY|QS_SENDMESSAGE, QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); PostMessageA(info.hwnd, WM_CHAR, 'z', 0); qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY) || + qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); InvalidateRect(info.hwnd, NULL, FALSE); qstatus = GetQueueStatus(qs_all_input); - ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY) || + qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY|QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); trace("signalling to send message\n"); @@ -9896,7 +9903,7 @@ static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) /* Timer proc messages are not dispatched to the window proc, * and therefore not logged. */ - if (msg.message == WM_TIMER || msg.message == WM_SYSTIMER) + if ((msg.message == WM_TIMER || msg.message == WM_SYSTIMER) && msg.hwnd) { struct recvd_message s_msg; @@ -10291,8 +10298,8 @@ static const struct message WmRestore_5[] = { }; static const struct message WmHide_1[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE, 0, SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_NOACTIVATE }, { HCBT_ACTIVATE, hook|optional }, { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } @@ -10840,6 +10847,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Paul Vriens : rpcrt4/tests: Don't crash on NT4.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 4d1fa5833eb13f47557912bb365b16974ee53144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1fa5833eb13f47557912bb3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 09:00:30 2009 +0100 rpcrt4/tests: Don't crash on NT4. --- dlls/rpcrt4/tests/server.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 353d0cd..f55bfcf 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1346,7 +1346,7 @@ s_authinfo_test(unsigned int protseq, int secure) todo_wine ok(principal != NULL, "NULL principal\n"); } - if (protseq == RPC_PROTSEQ_LRPC && principal) + if (protseq == RPC_PROTSEQ_LRPC && principal && pGetUserNameExA) { int len; char *spn; @@ -1399,6 +1399,9 @@ set_auth_info(RPC_BINDING_HANDLE handle) RPC_STATUS status; RPC_SECURITY_QOS qos; + if (!pGetUserNameExA) + return; + qos.Version = 1; qos.Capabilities = RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH; qos.IdentityTracking = RPC_C_QOS_IDENTITY_STATIC; @@ -1573,6 +1576,8 @@ START_TEST(server) domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); ok(pGetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); } + else + win_skip("GetUserNameExA is needed for some authentication tests\n"); argc = winetest_get_mainargs(&argv); progname = argv[0];

1 0

Paul Vriens : rpcrt4/tests: Skip more tests on Win9x/WinMe.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 876c3c352bc8874af598513a97aae6616d6cb94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=876c3c352bc8874af598513a9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 09:09:01 2009 +0100 rpcrt4/tests: Skip more tests on Win9x/WinMe. --- dlls/rpcrt4/tests/server.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f55bfcf..693fe69 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1338,6 +1338,11 @@ s_authinfo_test(unsigned int protseq, int secure) if (secure || protseq == RPC_PROTSEQ_LRPC) { status = RpcBindingInqAuthClientA(binding, &privs, &principal, &level, &authnsvc, NULL); + if (status == RPC_S_CANNOT_SUPPORT) + { + win_skip("RpcBindingInqAuthClientA not supported\n"); + return; + } ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); ok(privs != (RPC_AUTHZ_HANDLE)0xdeadbeef, "privs unchanged\n"); ok(principal != (unsigned char *)0xdeadbeef, "principal unchanged\n"); @@ -1362,11 +1367,6 @@ s_authinfo_test(unsigned int protseq, int secure) ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); status = RpcImpersonateClient(NULL); - if (status == RPC_S_CANNOT_SUPPORT) - { - win_skip("RpcImpersonateClient not supported\n"); - return; - } ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); status = RpcRevertToSelf(); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status);

1 0