August 2010 - Wine-Commits - list.winehq.org

David Hedberg : explorerframe: Implement InsertRoot and AppendRoot.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: f87891c36223325308e9c017e207a7c340559c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87891c36223325308e9c017e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:47 2010 +0200 explorerframe: Implement InsertRoot and AppendRoot. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 122 +++++++++++++++++++++++++++++++++++++- dlls/explorerframe/tests/nstc.c | 97 +++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f87891c36223325308e9c…

1 0

Henri Verbeet : wined3d: Only try to acquire a context in surface_cleanup() if there are GL resources to be destroyed.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 2b88b2d3511c4d9c76867c379b09b547f5946a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b88b2d3511c4d9c76867c379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:26 2010 +0200 wined3d: Only try to acquire a context in surface_cleanup() if there are GL resources to be destroyed. The reason we're in surface_cleanup() might for example be that context creation failed. --- dlls/wined3d/surface.c | 60 ++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 47282b0..101c8c2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,44 +36,42 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); static void surface_cleanup(IWineD3DSurfaceImpl *This) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_context *context = NULL; - renderbuffer_entry_t *entry, *entry2; - TRACE("(%p) : Cleaning up.\n", This); - /* Need a context to destroy the texture. Use the currently active render - * target, but only if the primary render target exists. Otherwise - * lastActiveRenderTarget is garbage. When destroying the primary render - * target, Uninit3D() will activate a context before doing anything. */ - if (device->render_targets && device->render_targets[0]) + if (This->texture_name || (This->Flags & SFLAG_PBO) || !list_empty(&This->renderbuffers)) { - context = context_acquire(device, NULL); - } + const struct wined3d_gl_info *gl_info; + renderbuffer_entry_t *entry, *entry2; + struct wined3d_context *context; - ENTER_GL(); + context = context_acquire(This->resource.device, NULL); + gl_info = context->gl_info; - if (This->texture_name) - { - /* Release the OpenGL texture. */ - TRACE("Deleting texture %u.\n", This->texture_name); - glDeleteTextures(1, &This->texture_name); - } + ENTER_GL(); - if (This->Flags & SFLAG_PBO) - { - /* Delete the PBO. */ - GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); - } + if (This->texture_name) + { + TRACE("Deleting texture %u.\n", This->texture_name); + glDeleteTextures(1, &This->texture_name); + } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) - { - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - HeapFree(GetProcessHeap(), 0, entry); - } + if (This->Flags & SFLAG_PBO) + { + TRACE("Deleting PBO %u.\n", This->pbo); + GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + } - LEAVE_GL(); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) + { + TRACE("Deleting renderbuffer %u.\n", entry->id); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + HeapFree(GetProcessHeap(), 0, entry); + } + + LEAVE_GL(); + + context_release(context); + } if (This->Flags & SFLAG_DIBSECTION) { @@ -92,8 +90,6 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); resource_cleanup((IWineD3DResource *)This); - - if (context) context_release(context); } UINT surface_calculate_size(const struct wined3d_format_desc *format_desc, UINT alignment, UINT width, UINT height)

1 0

Henri Verbeet : wined3d: Cleanup Get/SetDepthStencilSurface().
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 43a86d1e56469418acbfe3c89434b50cbf924a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a86d1e56469418acbfe3c89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:25 2010 +0200 wined3d: Cleanup Get/SetDepthStencilSurface(). --- dlls/wined3d/device.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9e65d7..f4bce23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5688,18 +5688,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice* iface, IWineD3DSurface **ppZStencilSurface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - *ppZStencilSurface = (IWineD3DSurface *)This->depth_stencil; - TRACE("(%p) : zStencilSurface returning %p\n", This, *ppZStencilSurface); +static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface **depth_stencil) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - if(*ppZStencilSurface != NULL) { - /* Note inc ref on returned surface */ - IWineD3DSurface_AddRef(*ppZStencilSurface); - return WINED3D_OK; - } else { - return WINED3DERR_NOTFOUND; - } + TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); + + *depth_stencil = (IWineD3DSurface *)device->depth_stencil; + TRACE("Returning depth/stencil surface %p.\n", *depth_stencil); + if (!*depth_stencil) return WINED3DERR_NOTFOUND; + IWineD3DSurface_AddRef(*depth_stencil); + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, @@ -5765,13 +5765,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *pNewZStencil) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *tmp; - TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, pNewZStencil, This->depth_stencil); + TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, depth_stencil, This->depth_stencil); - if (This->depth_stencil == (IWineD3DSurfaceImpl *)pNewZStencil) + if (This->depth_stencil == (IWineD3DSurfaceImpl *)depth_stencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); return WINED3D_OK; @@ -5794,11 +5795,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * } tmp = This->depth_stencil; - This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; + This->depth_stencil = (IWineD3DSurfaceImpl *)depth_stencil; if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); - if ((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) + if ((!tmp && depth_stencil) || (!depth_stencil && tmp)) { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE));

1 0

Jacek Caban : jscript: Use generic property for Error.message.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 04819e90661955e23b7c8d32490b601d2f0b3d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04819e90661955e23b7c8d324… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:32:39 2010 +0200 jscript: Use generic property for Error.message. --- dlls/jscript/error.c | 63 ++++++++++++++++--------------------------------- 1 files changed, 21 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 593244d..672a078 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -28,8 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; - - VARIANT message; } ErrorInstance; static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; @@ -48,25 +46,6 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; } -/* ECMA-262 3rd Edition 15.11.4.3 */ -static HRESULT Error_message(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - ErrorInstance *This = error_from_vdisp(jsthis); - - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - return VariantCopy(retv, &This->message); - case DISPATCH_PROPERTYPUT: - return VariantCopy(&This->message, get_arg(dp, 0)); - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - /* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -100,11 +79,15 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - if(V_VT(&error->message) != VT_EMPTY) { - hres = to_string(ctx, &error->message, ei, &msg); - if(SUCCEEDED(hres) && !*msg) { - SysFreeString(msg); - msg = NULL; + hres = jsdisp_propget_name(&error->dispex, messageW, &v, ei, caller); + if(SUCCEEDED(hres)) { + if(V_VT(&v) != VT_EMPTY) { + hres = to_string(ctx, &v, ei, &msg); + VariantClear(&v); + if(SUCCEEDED(hres) && !*msg) { + SysFreeString(msg); + msg = NULL; + } } } @@ -165,12 +148,10 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; - VariantClear(&This->message); heap_free(This); } static const builtin_prop_t Error_props[] = { - {messageW, Error_message, 0}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -183,15 +164,11 @@ static const builtin_info_t Error_info = { NULL }; -static const builtin_prop_t ErrorInst_props[] = { - {messageW, Error_message, 0}, -}; - static const builtin_info_t ErrorInst_info = { JSCLASS_ERROR, {NULL, Error_value, 0}, - sizeof(ErrorInst_props)/sizeof(*ErrorInst_props), - ErrorInst_props, + 0, + NULL, Error_destructor, NULL }; @@ -239,15 +216,17 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, return hres; } - V_VT(&err->message) = VT_BSTR; - if(msg) V_BSTR(&err->message) = SysAllocString(msg); - else V_BSTR(&err->message) = SysAllocStringLen(NULL, 0); - if(!V_BSTR(&err->message)) { - heap_free(err); - return E_OUTOFMEMORY; + V_VT(&v) = VT_BSTR; + if(msg) V_BSTR(&v) = SysAllocString(msg); + else V_BSTR(&v) = SysAllocStringLen(NULL, 0); + if(V_BSTR(&v)) { + hres = jsdisp_propput_name(&err->dispex, messageW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_name(&err->dispex, descriptionW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + SysFreeString(V_BSTR(&v)); + }else { + hres = E_OUTOFMEMORY; } - - hres = jsdisp_propput_name(&err->dispex, descriptionW, &err->message, NULL/*FIXME*/, NULL/*FIXME*/); if(FAILED(hres)) { jsdisp_release(&err->dispex); return hres;

1 0

David Hedberg : explorerframe: Implement RemoveRoot and RemoveAllRoots.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: b431995cc45eb5f4e9002ef074ba2dfa97852851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b431995cc45eb5f4e9002ef07… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:49 2010 +0200 explorerframe: Implement RemoveRoot and RemoveAllRoots. --- dlls/explorerframe/nstc.c | 75 ++++++++++++++++++++++++++++++++++++-- dlls/explorerframe/tests/nstc.c | 29 +++++++++++++++ 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 9116f66..e5d3913 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -99,6 +99,19 @@ static HRESULT events_OnItemAdded(NSTC2Impl *This, IShellItem *psi, BOOL fIsRoot return ret; } +static HRESULT events_OnItemDeleted(NSTC2Impl *This, IShellItem *psi, BOOL fIsRoot) +{ + HRESULT ret; + LONG refcount; + if(!This->pnstce) return S_OK; + + refcount = IShellItem_AddRef(psi); + ret = INameSpaceTreeControlEvents_OnItemDeleted(This->pnstce, psi, fIsRoot); + if(IShellItem_Release(psi) < refcount - 1) + ERR("ShellItem was released by client - please file a bug.\n"); + return ret; +} + /************************************************************************* * NamespaceTree helper functions */ @@ -270,11 +283,22 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) { TRACE("%p\n", This); + INameSpaceTreeControl_RemoveAllRoots((INameSpaceTreeControl*)This); + /* This reference was added in create_namespacetree */ INameSpaceTreeControl_Release((INameSpaceTreeControl*)This); return TRUE; } +static LRESULT on_tvn_deleteitemw(NSTC2Impl *This, LPARAM lParam) +{ + NMTREEVIEWW *nmtv = (NMTREEVIEWW*)lParam; + TRACE("%p\n", This); + + IShellItem_Release((IShellItem*)nmtv->itemOld.lParam); + return TRUE; +} + static LRESULT on_tvn_getdispinfow(NSTC2Impl *This, LPARAM lParam) { NMTVDISPINFOW *dispinfo = (NMTVDISPINFOW*)lParam; @@ -349,6 +373,7 @@ static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, nmhdr = (NMHDR*)lParam; switch(nmhdr->code) { + case TVN_DELETEITEMW: return on_tvn_deleteitemw(This, lParam); case TVN_GETDISPINFOW: return on_tvn_getdispinfow(This, lParam); default: break; } @@ -601,15 +626,57 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, IShellItem *psiRoot) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p)\n", This, psiRoot); - return E_NOTIMPL; + nstc_root *cursor, *root = NULL; + TRACE("%p (%p)\n", This, psiRoot); + + if(!psiRoot) + return E_NOINTERFACE; + + LIST_FOR_EACH_ENTRY(cursor, &This->roots, nstc_root, entry) + { + HRESULT hr; + int order; + hr = IShellItem_Compare(psiRoot, cursor->psi, SICHINT_DISPLAY, &order); + if(hr == S_OK) + { + root = cursor; + break; + } + } + + TRACE("root %p\n", root); + if(root) + { + SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); + events_OnItemDeleted(This, root->psi, TRUE); + list_remove(&root->entry); + HeapFree(GetProcessHeap(), 0, root); + return S_OK; + } + else + { + WARN("No matching root found.\n"); + return E_FAIL; + } } static HRESULT WINAPI NSTC2_fnRemoveAllRoots(INameSpaceTreeControl2* iface) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p\n", This); - return E_NOTIMPL; + nstc_root *cur1, *cur2; + UINT removed = 0; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->roots, nstc_root, entry) + { + NSTC2_fnRemoveRoot(iface, cur1->psi); + removed++; + } + + if(removed) + return S_OK; + else + return E_INVALIDARG; } static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 2f8caa0..f51698c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -541,6 +541,12 @@ static void test_basics(void) ok(hr == S_OK, "Failed to initialize control (0x%08x)\n", hr); /* Some tests on an uninitialized control */ + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == E_INVALIDARG, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveRoot(pnstc, psidesktop); + ok(hr == E_FAIL, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveRoot(pnstc, NULL); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); hr = INameSpaceTreeControl_AppendRoot(pnstc, psidesktop, SHCONTF_NONFOLDERS, 0, NULL); ok(hr == E_FAIL, "Got (0x%08x)\n", hr); process_msgs(); @@ -763,6 +769,9 @@ static void test_basics(void) skip("INameSpaceTreeControl2 missing.\n"); } + hr = INameSpaceTreeControl_RemoveRoot(pnstc, NULL); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + /* Append / Insert root */ if(0) { @@ -780,6 +789,23 @@ static void test_basics(void) ok(hr == S_OK, "Got (0x%08x)\n", hr); process_msgs(); + hr = INameSpaceTreeControl_RemoveRoot(pnstc, psidesktop); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveRoot(pnstc, psidesktop); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveRoot(pnstc, psidesktop); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_RemoveRoot(pnstc, psidesktop); + ok(hr == E_FAIL, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == E_INVALIDARG, "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psidesktop, SHCONTF_FOLDERS, 0, NULL); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_InsertRoot(pnstc, 0, psidesktop, SHCONTF_FOLDERS, 0, NULL); ok(hr == S_OK, "Got (0x%08x)\n", hr); hr = INameSpaceTreeControl_InsertRoot(pnstc, -1, psidesktop, SHCONTF_FOLDERS, 0, NULL); @@ -791,6 +817,9 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 1, psidesktop, SHCONTF_FOLDERS, 0, NULL); ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + IShellItem_Release(psidesktop); IShellItem_Release(psidesktop2);

1 0

Henri Verbeet : wined3d: Cleanup Get/SetRenderTarget().
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 009cd78fa448ede597ecae18df8878079ae1695e URL: http://source.winehq.org/git/wine.git/?a=commit;h=009cd78fa448ede597ecae18d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 4 11:10:24 2010 +0200 wined3d: Cleanup Get/SetRenderTarget(). --- dlls/wined3d/device.c | 107 ++++++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dabc451..f9e65d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5571,21 +5571,25 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac } /* rendertarget and depth stencil functions */ -static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface,DWORD RenderTargetIndex, IWineD3DSurface **ppRenderTarget) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice *iface, + DWORD render_target_idx, IWineD3DSurface **render_target) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - if (RenderTargetIndex >= This->adapter->gl_info.limits.buffers) + TRACE("iface %p, render_target_idx %u, render_target %p.\n", + iface, render_target_idx, render_target); + + if (render_target_idx >= device->adapter->gl_info.limits.buffers) { - ERR("(%p) : Only %d render targets are supported.\n", - This, This->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); return WINED3DERR_INVALIDCALL; } - *ppRenderTarget = (IWineD3DSurface *)This->render_targets[RenderTargetIndex]; - TRACE("(%p) : RenderTarget %d Index returning %p\n", This, RenderTargetIndex, *ppRenderTarget); - /* Note inc ref on returned surface */ - if(*ppRenderTarget != NULL) - IWineD3DSurface_AddRef(*ppRenderTarget); + *render_target = (IWineD3DSurface *)device->render_targets[render_target_idx]; + if (*render_target) IWineD3DSurface_AddRef(*render_target); + + TRACE("Returning render target %p.\n", *render_target); + return WINED3D_OK; } @@ -5698,63 +5702,66 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice } } -static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget, - BOOL set_viewport) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; +static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, + DWORD render_target_idx, IWineD3DSurface *render_target, BOOL set_viewport) +{ + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); + TRACE("iface %p, render_target_idx %u, render_target %p, set_viewport %#x.\n", + iface, render_target_idx, render_target, set_viewport); - if (RenderTargetIndex >= This->adapter->gl_info.limits.buffers) + if (render_target_idx >= device->adapter->gl_info.limits.buffers) { - WARN("(%p) : Unsupported target %u set, returning WINED3DERR_INVALIDCALL(only %u supported)\n", - This, RenderTargetIndex, This->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); return WINED3DERR_INVALIDCALL; } + if (render_target == (IWineD3DSurface *)device->render_targets[render_target_idx]) + { + TRACE("Trying to do a NOP SetRenderTarget operation.\n"); + return WINED3D_OK; + } + /* Render target 0 can't be set to NULL. */ - if (!pRenderTarget && !RenderTargetIndex) + if (!render_target && !render_target_idx) { WARN("Trying to set render target 0 to NULL.\n"); return WINED3DERR_INVALIDCALL; } - if (pRenderTarget && !(((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("(%p)Trying to set the render target to a surface(%p) that wasn't created with a usage of WINED3DUSAGE_RENDERTARGET\n",This ,pRenderTarget); + if (render_target && !(((IWineD3DSurfaceImpl *)render_target)->resource.usage & WINED3DUSAGE_RENDERTARGET)) + { + FIXME("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; } - /* If we are trying to set what we already have, don't bother */ - if (pRenderTarget == (IWineD3DSurface *)This->render_targets[RenderTargetIndex]) + if (render_target) + IWineD3DSurface_AddRef(render_target); + if (device->render_targets[render_target_idx]) + IWineD3DSurface_Release((IWineD3DSurface *)device->render_targets[render_target_idx]); + device->render_targets[render_target_idx] = (IWineD3DSurfaceImpl *)render_target; + + /* Render target 0 is special. */ + if (!render_target_idx && set_viewport) { - TRACE("Trying to do a NOP SetRenderTarget operation\n"); - return WINED3D_OK; - } - if (pRenderTarget) - IWineD3DSurface_AddRef(pRenderTarget); - if (This->render_targets[RenderTargetIndex]) - IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[RenderTargetIndex]); - This->render_targets[RenderTargetIndex] = (IWineD3DSurfaceImpl *)pRenderTarget; - - /* Render target 0 is special */ - if(RenderTargetIndex == 0 && set_viewport) { - /* Finally, reset the viewport and scissor rect as the MSDN states. - * Tests show that stateblock recording is ignored, the change goes - * directly into the primary stateblock. - */ - This->stateBlock->viewport.Height = This->render_targets[0]->currentDesc.Height; - This->stateBlock->viewport.Width = This->render_targets[0]->currentDesc.Width; - This->stateBlock->viewport.X = 0; - This->stateBlock->viewport.Y = 0; - This->stateBlock->viewport.MaxZ = 1.0f; - This->stateBlock->viewport.MinZ = 0.0f; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); - - This->stateBlock->scissorRect.top = 0; - This->stateBlock->scissorRect.left = 0; - This->stateBlock->scissorRect.right = This->stateBlock->viewport.Width; - This->stateBlock->scissorRect.bottom = This->stateBlock->viewport.Height; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); + /* Set the viewport and scissor rectangles, if requested. Tests show + * that stateblock recording is ignored, the change goes directly + * into the primary stateblock. */ + device->stateBlock->viewport.Height = device->render_targets[0]->currentDesc.Height; + device->stateBlock->viewport.Width = device->render_targets[0]->currentDesc.Width; + device->stateBlock->viewport.X = 0; + device->stateBlock->viewport.Y = 0; + device->stateBlock->viewport.MaxZ = 1.0f; + device->stateBlock->viewport.MinZ = 0.0f; + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_VIEWPORT); + + device->stateBlock->scissorRect.top = 0; + device->stateBlock->scissorRect.left = 0; + device->stateBlock->scissorRect.right = device->stateBlock->viewport.Width; + device->stateBlock->scissorRect.bottom = device->stateBlock->viewport.Height; + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SCISSORRECT); } + return WINED3D_OK; }

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetQuery.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 45069a33307abeaeceb53c04d866b4e3ee126cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=45069a33307abeaeceb53c04d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:21:16 2010 -0400 urlmon: Implemented IUri_GetQuery. --- dlls/urlmon/tests/uri.c | 206 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++++-- 2 files changed, 122 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45069a33307abeaeceb53…

1 0

Alexander Nicolaysen Sørnes : mshtml: Send more informative messages to OleInPlaceFrame.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: aa733bedd54be8c7ea7ea076ca208a5afbf831e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa733bedd54be8c7ea7ea076c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 30 21:56:05 2010 +0200 mshtml: Send more informative messages to OleInPlaceFrame. --- dlls/mshtml/En.rc | 6 +++++ dlls/mshtml/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 6 +--- dlls/mshtml/persist.c | 40 ++++++++++++++++++++------------- dlls/mshtml/resource.h | 4 +++ 6 files changed, 86 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index e44b373..ba55bf7 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -20,6 +20,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + STRINGTABLE + { + IDS_STATUS_DONE "Done" + IDS_STATUS_DOWNLOADINGFROM "Downloading from %s..." +} + STRINGTABLE { IDS_HTMLDISABLED "HTML rendering is currently disabled." diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f54c6e3..d61c1f4 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -40,6 +40,7 @@ #define INIT_GUID #include "mshtml_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -48,6 +49,7 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static HDC display_dc; +static LPWSTR status_strings[NUM_STATUS_STRINGS]; static void thread_detach(void) { @@ -63,6 +65,13 @@ static void thread_detach(void) heap_free(thread_data); } +void free_strings(void) +{ + int i; + for(i = 0; i < NUM_STATUS_STRINGS; i++) + heap_free(status_strings[i]); +} + static void process_detach(void) { close_gecko(); @@ -74,6 +83,46 @@ static void process_detach(void) TlsFree(mshtml_tls); if(display_dc) DeleteObject(display_dc); + + free_strings(); +} + +void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg) +{ + int index = id - IDS_STATUS_DONE; + LPWSTR p = status_strings[index]; + + if(!doc->frame) + return; + + if(!p) + { + DWORD len = 255; + p = heap_alloc(len * sizeof(WCHAR)); + len = LoadStringW(hInst, id, p, len); + len++; + p = heap_realloc(p, len * sizeof(WCHAR)); + if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) + { + heap_free(p); + p = status_strings[index]; + } + } + + if(arg) + { + DWORD len = lstrlenW(p) + lstrlenW(arg) - 1; + LPWSTR buf = heap_alloc(len * sizeof(WCHAR)); + + snprintfW(buf, len - 1, p, arg); + + p = buf; + } + + IOleInPlaceFrame_SetStatusText(doc->frame, p); + + if(arg) + heap_free(p); } HINSTANCE get_shdoclc(void) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2db2410..ee92806 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1024,5 +1024,6 @@ static inline void windowref_release(windowref_t *ref) HDC get_display_dc(void); HINSTANCE get_shdoclc(void); +void set_statustext(HTMLDocumentObj*,INT,LPCWSTR); extern HINSTANCE hInst; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 6da5ded..8dda1e5 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -34,6 +34,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -239,10 +240,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(doc_obj->view_sink) IAdviseSink_OnViewChange(doc_obj->view_sink, DVASPECT_CONTENT, -1); - if(doc_obj->frame) { - static const WCHAR wszDone[] = {'D','o','n','e',0}; - IOleInPlaceFrame_SetStatusText(doc_obj->frame, wszDone); - } + set_statustext(doc_obj, IDS_STATUS_DONE, NULL); update_title(doc_obj); } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 44ccd0f..76e3773 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -37,6 +37,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -44,6 +45,7 @@ typedef struct { task_t header; HTMLDocumentObj *doc; BOOL set_download; + LPOLESTR url; } download_proc_task_t; static BOOL use_gecko_script(LPCWSTR url) @@ -134,8 +136,8 @@ static void set_downloading_proc(task_t *_task) TRACE("(%p)\n", doc); - if(doc->frame) - IOleInPlaceFrame_SetStatusText(doc->frame, NULL /* FIXME */); + set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url); + CoTaskMemFree(task->url); if(!doc->client) return; @@ -243,26 +245,31 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel } hres = create_doc_uri(This->window, url, &nsuri); - CoTaskMemFree(url); - if(FAILED(hres)) - return hres; - if(async_bsc) { - bscallback = async_bsc; - }else { - hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + { + if(async_bsc) { + bscallback = async_bsc; + }else { + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); + } } - hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); - nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) - set_window_bscallback(This->window, bscallback); - if(bscallback != async_bsc) - IUnknown_Release((IUnknown*)bscallback); + { + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); + nsISupports_Release((nsISupports*)nsuri); /* FIXME */ + if(SUCCEEDED(hres)) + set_window_bscallback(This->window, bscallback); + if(bscallback != async_bsc) + IUnknown_Release((IUnknown*)bscallback); + } + if(FAILED(hres)) + { + CoTaskMemFree(url); return hres; + } HTMLDocument_LockContainer(This->doc_obj, TRUE); @@ -275,6 +282,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel download_task = heap_alloc(sizeof(download_proc_task_t)); download_task->doc = This->doc_obj; download_task->set_download = set_download; + download_task->url = url; push_task(&download_task->header, set_downloading_proc, This->doc_obj->basedoc.task_magic); return S_OK; diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index 1e92637..fd69bfd 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -25,6 +25,10 @@ #define IDS_DOWNLOADING 7502 #define IDS_INSTALLING 7503 +#define NUM_STATUS_STRINGS 2 +#define IDS_STATUS_DOWNLOADINGFROM 7550 +#define IDS_STATUS_DONE 7551 + #define ID_DWL_DIALOG 7600 #define ID_DWL_PROGRESS 7601 #define ID_DWL_INSTALL 7602

1 0

Misha Koshelev : d3dx9: Add stub and tests for D3DXCreateMesh.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: bf46b4fdfc7deb51be27bae14cce794ffb4d068e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf46b4fdfc7deb51be27bae14… Author: Misha Koshelev <misha680(a)gmail.com> Date: Mon Aug 2 13:26:35 2010 -0500 d3dx9: Add stub and tests for D3DXCreateMesh. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 +++ dlls/d3dx9_36/tests/mesh.c | 139 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9mesh.h | 1 + 4 files changed, 149 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 622a03c..616b8a4 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -71,7 +71,7 @@ @ stub D3DXCreateKeyframedAnimationSet @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) -@ stub D3DXCreateMesh +@ stdcall D3DXCreateMesh(long long long ptr ptr ptr) @ stub D3DXCreateMeshFVF @ stub D3DXCreateNPatchMesh @ stub D3DXCreatePMeshFromStream diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index bfa1c23..df453f7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -328,6 +328,14 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST return TRUE; } +HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST LPD3DVERTEXELEMENT9 *declaration, + LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) +{ + FIXME("(%d, %d, %d, %p, %p, %p): stub\n", numfaces, numvertices, options, declaration, device, mesh); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) { diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 87003d1..3920041 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -667,6 +667,144 @@ static void D3DXIntersectTriTest(void) ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); } +static void D3DXCreateMeshTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device, *test_device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *d3dxmesh; + int i, size; + D3DVERTEXELEMENT9 test_decl[MAX_FVF_DECL_SIZE]; + DWORD fvf, options; + struct mesh mesh; + + static const D3DVERTEXELEMENT9 decl[3] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), }; + + hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, NULL, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) + { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, 0, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + if (hr == D3D_OK) + { + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, 0, device, &d3dxmesh); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh); + todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + /* device */ + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, &test_device); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + ok(test_device == device, "Got result %p, expected %p\n", test_device, device); + + if (hr == D3D_OK) + { + IDirect3DDevice9_Release(device); + } + + /* declaration */ + hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, test_decl); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + if (hr == D3D_OK) + { + size = sizeof(decl) / sizeof(decl[0]); + for (i = 0; i < size - 1; i++) + { + ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream); + ok(test_decl[i].Type == decl[i].Type, "Returned type %d, expected %d\n", test_decl[i].Type, decl[i].Type); + ok(test_decl[i].Method == decl[i].Method, "Returned method %d, expected %d\n", test_decl[i].Method, decl[i].Method); + ok(test_decl[i].Usage == decl[i].Usage, "Returned usage %d, expected %d\n", test_decl[i].Usage, decl[i].Usage); + ok(test_decl[i].UsageIndex == decl[i].UsageIndex, "Returned usage index %d, expected %d\n", test_decl[i].UsageIndex, decl[i].UsageIndex); + ok(test_decl[i].Offset == decl[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, decl[i].Offset); + } + ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */ + } + + /* FVF */ + fvf = d3dxmesh->lpVtbl->GetFVF(d3dxmesh); + ok(fvf == (D3DFVF_XYZ | D3DFVF_NORMAL), "Got result %x, expected %x (D3DFVF_XYZ | D3DFVF_NORMAL)\n", fvf, D3DFVF_XYZ | D3DFVF_NORMAL); + + /* options */ + options = d3dxmesh->lpVtbl->GetOptions(d3dxmesh); + ok(options == D3DXMESH_MANAGED, "Got result %x, expected %x (D3DXMESH_MANAGED)\n", options, D3DXMESH_MANAGED); + + /* rest */ + if (!new_mesh(&mesh, 3, 1)) + { + skip("Couldn't create mesh\n"); + } + else + { + memset(mesh.vertices, 0, mesh.number_of_vertices * sizeof(*mesh.vertices)); + memset(mesh.faces, 0, mesh.number_of_faces * sizeof(*mesh.faces)); + + compare_mesh("createmeshfvf", d3dxmesh, &mesh); + + free_mesh(&mesh); + } + + d3dxmesh->lpVtbl->Release(d3dxmesh); + } + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -1031,6 +1169,7 @@ START_TEST(mesh) D3DXDeclaratorFromFVFTest(); D3DXGetFVFVertexSizeTest(); D3DXIntersectTriTest(); + D3DXCreateMeshTest(); D3DXCreateSphereTest(); test_get_decl_vertex_size(); } diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 20d285c..063a587 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) extern "C" { #endif +HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST LPD3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx); UINT WINAPI D3DXGetFVFVertexSize(DWORD);

1 0

Oldřich Jedlička : ddraw/tests: New attachment/ flipping tests for back buffers.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 5c05b141678be7c3049eedef41fee1d1c6cee9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c05b141678be7c3049eedef4… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Aug 3 21:26:15 2010 +0200 ddraw/tests: New attachment/flipping tests for back buffers. --- dlls/ddraw/tests/dsurface.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b5f6f2c..76bfc7e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3452,6 +3452,123 @@ static void BackBufferCreateSurfaceTest(void) IDirectDraw7_Release(dd7); } +static void BackBufferAttachmentFlipTest(void) +{ + HRESULT hr; + IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; + DDSURFACEDESC ddsd; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_SetCooperativeLevel(lpDD, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + /* Perform attachment tests on a back-buffer */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface2, NULL); + todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + + if (surface2 != NULL) + { + /* Try a single primary and a two back buffers */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface3, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* This one has a different size */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface4, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to a front buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + /* Try the reverse without detaching first */ + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a front buffer to a back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + /* Try to detach reversed */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); + /* Now the proper detach */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to another back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface3, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a back buffer to a front buffer of different size returned %08x\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface4, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a front buffer to a back buffer of different size returned %08x\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + } + + hr =IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + DestroyWindow(window); +} + START_TEST(dsurface) { HRESULT ret; @@ -3506,5 +3623,6 @@ START_TEST(dsurface) GetDCTest(); GetDCFormatTest(); BackBufferCreateSurfaceTest(); + BackBufferAttachmentFlipTest(); ReleaseDirectDraw(); }

1 0