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

David Hedberg : explorerframe: Implement RemoveRoot and RemoveAllRoots.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

David Hedberg : explorerframe: Implement GetRootItems.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 2761b0ded649147cba0398ba3fd65edcb45f96aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2761b0ded649147cba0398ba3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 4 03:57:50 2010 +0200 explorerframe: Implement GetRootItems. --- dlls/explorerframe/nstc.c | 31 ++++++- dlls/explorerframe/tests/nstc.c | 205 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2761b0ded649147cba039…

1 0

Jacek Caban : jscript: Use generic property for Error.description.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 96990cfa8ea450f856621c76ccd60075d76adbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=96990cfa8ea450f856621c76c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:32:11 2010 +0200 jscript: Use generic property for Error.description. --- dlls/jscript/error.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 2465c77..593244d 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; - VARIANT description; VARIANT message; } ErrorInstance; @@ -49,24 +48,6 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; } -static HRESULT Error_description(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->description); - case DISPATCH_PROPERTYPUT: - return VariantCopy(&This->description, get_arg(dp, 0)); - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - /* 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) @@ -184,13 +165,11 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; - VariantClear(&This->description); VariantClear(&This->message); heap_free(This); } static const builtin_prop_t Error_props[] = { - {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -205,7 +184,6 @@ static const builtin_info_t Error_info = { }; static const builtin_prop_t ErrorInst_props[] = { - {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, }; @@ -264,14 +242,17 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, V_VT(&err->message) = VT_BSTR; if(msg) V_BSTR(&err->message) = SysAllocString(msg); else V_BSTR(&err->message) = SysAllocStringLen(NULL, 0); - - VariantCopy(&err->description, &err->message); - if(!V_BSTR(&err->message)) { heap_free(err); return E_OUTOFMEMORY; } + hres = jsdisp_propput_name(&err->dispex, descriptionW, &err->message, NULL/*FIXME*/, NULL/*FIXME*/); + if(FAILED(hres)) { + jsdisp_release(&err->dispex); + return hres; + } + *ret = &err->dispex; return S_OK; }

1 0

Jacek Caban : jscript: Use generic property for Error.message.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Jacek Caban : jscript: Fixed Error. toString implementation for non-Error this.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: ae8cb5a1e6b63741ecfd41b4c7c79bfcaef6050d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8cb5a1e6b63741ecfd41b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 15:32:59 2010 +0200 jscript: Fixed Error.toString implementation for non-Error this. --- dlls/jscript/error.c | 43 ++++++++++++++++++++++++++++--------------- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 672a078..a440a41 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -47,39 +47,45 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) } /* ECMA-262 3rd Edition 15.11.4.4 */ -static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, +static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - ErrorInstance *error; - BSTR name, msg = NULL, ret = NULL; + DispatchEx *jsthis; + BSTR name = NULL, msg = NULL, ret = NULL; VARIANT v; HRESULT hres; - static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; + static const WCHAR object_errorW[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; TRACE("\n"); - error = error_this(jsthis); - if(ctx->version < 2 || !error) { + jsthis = get_jsdisp(vthis); + if(!jsthis || ctx->version < 2) { if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocString(str); + V_BSTR(retv) = SysAllocString(object_errorW); if(!V_BSTR(retv)) return E_OUTOFMEMORY; } return S_OK; } - hres = jsdisp_propget_name(&error->dispex, nameW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, nameW, &v, ei, caller); if(FAILED(hres)) return hres; - hres = to_string(ctx, &v, ei, &name); - VariantClear(&v); - if(FAILED(hres)) - return hres; + if(V_VT(&v) != VT_EMPTY) { + hres = to_string(ctx, &v, ei, &name); + VariantClear(&v); + if(FAILED(hres)) + return hres; + if(!*name) { + SysFreeString(name); + name = NULL; + } + } - hres = jsdisp_propget_name(&error->dispex, messageW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, messageW, &v, ei, caller); if(SUCCEEDED(hres)) { if(V_VT(&v) != VT_EMPTY) { hres = to_string(ctx, &v, ei, &msg); @@ -92,7 +98,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } if(SUCCEEDED(hres)) { - if(msg) { + if(name && msg) { DWORD name_len, msg_len; name_len = SysStringLen(name); @@ -105,9 +111,16 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, ret[name_len+1] = ' '; memcpy(ret+name_len+2, msg, msg_len*sizeof(WCHAR)); } - }else { + }else if(name) { ret = name; name = NULL; + }else if(msg) { + ret = msg; + msg = NULL; + }else { + ret = SysAllocString(object_errorW); + if(!V_BSTR(retv)) + hres = E_OUTOFMEMORY; } } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f794244..c57666d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1780,6 +1780,12 @@ ok(err.message === "message", "err.message = " + err.message); ok(err.description === "message", "err.description = " + err.description); err = new Error(); ok(err.number === 0, "err.number = " + err.number); +ok(err.description === "", "err.description = " + err.description); +err.description = 5; +ok(err.description === 5, "err.description = " + err.description); +ok(err.message === "", "err.message = " + err.message); +err.message = 4; +ok(err.message === 4, "err.message = " + err.message); ok(!("number" in Error), "number is in Error"); @@ -1789,6 +1795,33 @@ tmp.toString = function() { return "test"; }; tmp = Error.prototype.toString.call(tmp); ok(tmp === "[object Error]", "Error.prototype.toString.call(tmp) = " + tmp); +if(invokeVersion >= 2) { + obj = new Object(); + obj.name = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.name = 6; + obj.message = false; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "6: false", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.message = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); + + obj = new Object(); + obj.name = ""; + obj.message = "test"; + tmp = Error.prototype.toString.call(obj); + ok(tmp === "test", "Error.prototype.toString.call(obj) = " + tmp); +} + +tmp = Error.prototype.toString.call(testObj); +ok(tmp === "[object Error]", "Error.prototype.toString.call(testObj) = " + tmp); + err = new Error(); err.name = null; ok(err.name === null, "err.name = " + err.name + " expected null");

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetQuery.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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

Thomas Mullaly : urlmon: Implemented IUri_GetPathAndQuery.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: b5e70534c611cfff36fed8227d8746f80f9ee20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e70534c611cfff36fed8227… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:43:10 2010 -0400 urlmon: Implemented IUri_GetPathAndQuery. --- dlls/urlmon/tests/uri.c | 235 ++++++++++++++++++++++++++--------------------- dlls/urlmon/uri.c | 29 +++++-- 2 files changed, 154 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e70534c611cfff36fed…

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: ebacf49f0297fefbc112b59835443abfb9f6e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebacf49f0297fefbc112b5983… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 3 23:23:26 2010 +0100 comctl32: Constify some variables. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/treeview.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 354ab66..8ecfee3 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2661,7 +2661,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, const REBARBANDINFOW *lprbbi, static LRESULT -REBAR_SetBarInfo (REBAR_INFO *infoPtr, LPREBARINFO lpInfo) +REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo) { REBAR_BAND *lpBand; UINT i; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c99153e..7057531 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2620,7 +2620,7 @@ static inline LRESULT TAB_Paint (TAB_INFO *infoPtr, HDC hdcPaint) } static LRESULT -TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, TCITEMW *pti, BOOL bUnicode) +TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode) { TAB_ITEM *item; RECT rect; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e4c465b..2745ce9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5829,10 +5829,10 @@ TREEVIEW_Unregister(void) /* Tree Verification ****************************************************/ static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item); +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item); static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, - TREEVIEW_ITEM *item) + const TREEVIEW_ITEM *item) { assert(infoPtr != NULL); assert(item != NULL); @@ -5871,7 +5871,7 @@ static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, } static inline void -TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { assert(item != NULL); @@ -5887,9 +5887,9 @@ TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) } static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *child; + const TREEVIEW_ITEM *child; assert(item != NULL); for (child = item->firstChild; child != NULL; child = child->nextSibling)

1 0

Oldřich Jedlička : ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 109cb9fee483dc47604565647858d24dd395f1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109cb9fee483dc47604565647… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Aug 3 21:26:14 2010 +0200 ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests. --- dlls/ddraw/tests/dsurface.c | 91 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 20e8634..b5f6f2c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -30,6 +30,7 @@ #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; +static DDCAPS ddcaps; static BOOL CreateDirectDraw(void) { @@ -2851,16 +2852,12 @@ static void SurfaceCapsTest(void) DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE }; UINT i; - DDCAPS ddcaps; /* Tests various surface flags, what changes do they undergo during surface creation. Forsaken * engine expects texture surfaces without memory flag to get a video memory flag right after * creation. Currently, Wine adds DDSCAPS_FRONTBUFFER to primary surface, but native doesn't do this * for single buffered primaries. Because of this primary surface creation tests are todo_wine. No real * app is known so far to care about this. */ - ddcaps.dwSize = sizeof(DDCAPS); - hr = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); - ok(hr == DD_OK, "IDirectDraw_GetCaps failed with %08x\n", hr); if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { @@ -3378,6 +3375,83 @@ static void GetDCFormatTest(void) IDirectDraw7_Release(dd7); } +static void BackBufferCreateSurfaceTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC created_ddsd; + DDSURFACEDESC2 ddsd2; + IDirectDrawSurface *surf; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + + const DWORD caps = DDSCAPS_BACKBUFFER; + const DWORD expected_caps = DDSCAPS_BACKBUFFER | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM; + + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n"); + return ; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = caps; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = caps; + memset(&created_ddsd, 0, sizeof(created_ddsd)); + created_ddsd.dwSize = sizeof(DDSURFACEDESC); + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); + todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + if (surf != NULL) + { + hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); + ok(SUCCEEDED(hr), "IDirectDraw_GetSurfaceDesc failed: 0x%08x\n", hr); + ok(created_ddsd.ddsCaps.dwCaps == expected_caps, + "GetSurfaceDesc returned caps %x, expected %x\n", created_ddsd.ddsCaps.dwCaps, + expected_caps); + IDirectDrawSurface_Release(surf); + } + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw2_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw4_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -3401,6 +3475,14 @@ START_TEST(dsurface) return; } + ddcaps.dwSize = sizeof(DDCAPS); + ret = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); + if (ret != DD_OK) + { + skip("IDirectDraw_GetCaps failed with %08x\n", ret); + return; + } + MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface(); @@ -3423,5 +3505,6 @@ START_TEST(dsurface) SurfaceCapsTest(); GetDCTest(); GetDCFormatTest(); + BackBufferCreateSurfaceTest(); ReleaseDirectDraw(); }

1 0

Oldřich Jedlička : ddraw/tests: New attachment/ flipping tests for back buffers.
by Alexandre Julliard 04 Aug '10

04 Aug '10

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