April 2014 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Don't use default process heap.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: d48314c8a50a69538985a8ce273fba1611585fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48314c8a50a69538985a8ce2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 22 14:38:47 2014 +0200 msvcrt: Don't use default process heap. --- dlls/msvcrt/heap.c | 40 ++++++++++++++++++++++++++-------------- dlls/msvcrt/main.c | 8 +++++++- dlls/msvcrt/msvcrt.h | 2 ++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0b960f9..0cac3fe 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ ~(alignment - 1)) - offset)) +static HANDLE heap; typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); @@ -59,7 +60,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) do { - retval = HeapAlloc(GetProcessHeap(), 0, size); + retval = HeapAlloc(heap, 0, size); if(retval) { TRACE("(%ld) returning %p\n", size, retval); @@ -94,7 +95,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi void CDECL MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); - HeapFree(GetProcessHeap(), 0, mem); + HeapFree(heap, 0, mem); } @@ -166,7 +167,7 @@ int CDECL _callnewh(MSVCRT_size_t size) */ void* CDECL _expand(void* mem, MSVCRT_size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); + return HeapReAlloc(heap, HEAP_REALLOC_IN_PLACE_ONLY, mem, size); } /********************************************************************* @@ -174,7 +175,7 @@ void* CDECL _expand(void* mem, MSVCRT_size_t size) */ int CDECL _heapchk(void) { - if (!HeapValidate( GetProcessHeap(), 0, NULL)) + if (!HeapValidate( heap, 0, NULL)) { msvcrt_set_errno(GetLastError()); return MSVCRT__HEAPBADNODE; @@ -187,7 +188,7 @@ int CDECL _heapchk(void) */ int CDECL _heapmin(void) { - if (!HeapCompact( GetProcessHeap(), 0 )) + if (!HeapCompact( heap, 0 )) { if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) msvcrt_set_errno(GetLastError()); @@ -209,7 +210,7 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) phe.wFlags = next->_useflag == MSVCRT__USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && - !HeapValidate( GetProcessHeap(), 0, phe.lpData )) + !HeapValidate( heap, 0, phe.lpData )) { UNLOCK_HEAP; msvcrt_set_errno(GetLastError()); @@ -218,7 +219,7 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) do { - if (!HeapWalk( GetProcessHeap(), &phe )) + if (!HeapWalk( heap, &phe )) { UNLOCK_HEAP; if (GetLastError() == ERROR_NO_MORE_ITEMS) @@ -267,11 +268,11 @@ int CDECL _heapadd(void* mem, MSVCRT_size_t size) } /********************************************************************* - * _heapadd (MSVCRT.@) + * _get_heap_handle (MSVCRT.@) */ MSVCRT_intptr_t CDECL _get_heap_handle(void) { - return (MSVCRT_intptr_t)GetProcessHeap(); + return (MSVCRT_intptr_t)heap; } /********************************************************************* @@ -279,7 +280,7 @@ MSVCRT_intptr_t CDECL _get_heap_handle(void) */ MSVCRT_size_t CDECL _msize(void* mem) { - MSVCRT_size_t size = HeapSize(GetProcessHeap(),0,mem); + MSVCRT_size_t size = HeapSize(heap,0,mem); if (size == ~(MSVCRT_size_t)0) { WARN(":Probably called with non wine-allocated memory, ret = -1\n"); @@ -309,7 +310,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs */ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count ); + return HeapAlloc( heap, HEAP_ZERO_MEMORY, size * count ); } /********************************************************************* @@ -317,7 +318,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) */ void CDECL MSVCRT_free(void* ptr) { - HeapFree(GetProcessHeap(),0,ptr); + HeapFree(heap,0,ptr); } /********************************************************************* @@ -325,7 +326,7 @@ void CDECL MSVCRT_free(void* ptr) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { - void *ret = HeapAlloc(GetProcessHeap(),0,size); + void *ret = HeapAlloc(heap,0,size); if (!ret) *MSVCRT__errno() = MSVCRT_ENOMEM; return ret; @@ -337,7 +338,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); - if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + if (size) return HeapReAlloc(heap, 0, ptr, size); MSVCRT_free(ptr); return NULL; } @@ -715,3 +716,14 @@ int CDECL MSVCRT_strncpy_s(char *dest, MSVCRT_size_t numberOfElements, dest[0] = '\0'; return MSVCRT_EINVAL; } + +BOOL msvcrt_init_heap(void) +{ + heap = HeapCreate(0, 0, 0); + return heap != NULL; +} + +void msvcrt_destroy_heap(void) +{ + HeapDestroy(heap); +} diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 08c1f65..5a3bba7 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -98,12 +98,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: msvcrt_init_exception(hinstDLL); - if (!msvcrt_init_tls()) + if(!msvcrt_init_heap()) + return FALSE; + if(!msvcrt_init_tls()) { + msvcrt_destroy_heap(); return FALSE; + } msvcrt_init_mt_locks(); if(!msvcrt_init_locale()) { msvcrt_free_mt_locks(); msvcrt_free_tls_mem(); + msvcrt_destroy_heap(); return FALSE; } msvcrt_init_math(); @@ -133,6 +138,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (!msvcrt_free_tls()) return FALSE; MSVCRT__free_locale(MSVCRT_locale); + msvcrt_destroy_heap(); TRACE("finished process free\n"); break; case DLL_THREAD_DETACH: diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0989ba8..2a83b32 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -274,6 +274,8 @@ extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; +extern BOOL msvcrt_init_heap(void) DECLSPEC_HIDDEN; +extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Fixed HTMLElementCollectionEnum_Next implementation for NULL pCeltFetched.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 3ec1da918ca8147a5780564fb63d606b0fd8610f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec1da918ca8147a5780564fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 22 16:23:01 2014 +0200 mshtml: Fixed HTMLElementCollectionEnum_Next implementation for NULL pCeltFetched. --- dlls/mshtml/htmlelemcol.c | 3 ++- dlls/mshtml/tests/dom.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index e9cd1af..5819d44 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -160,7 +160,8 @@ static HRESULT WINAPI HTMLElementCollectionEnum_Next(IEnumVARIANT *iface, ULONG } This->iter += fetched; - *pCeltFetched = fetched; + if(pCeltFetched) + *pCeltFetched = fetched; return fetched == celt ? S_OK : S_FALSE; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 65ca1d3..3a6380a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2163,9 +2163,10 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, fetched = 0; V_VT(&v) = VT_ERROR; - hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + hres = IEnumVARIANT_Next(enum_var, 1, &v, i ? &fetched : NULL); ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); - ok_(__FILE__,line)(fetched == 1, "fetched = %d\n", fetched); + if(i) + ok_(__FILE__,line)(fetched == 1, "fetched = %d\n", fetched); ok_(__FILE__,line)(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); ok_(__FILE__,line)(iface_cmp((IUnknown*)disp, (IUnknown*)V_DISPATCH(&v)), "disp != V_DISPATCH(v)\n"); IDispatch_Release(V_DISPATCH(&v)); @@ -2183,6 +2184,13 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, hres = IEnumVARIANT_Reset(enum_var); ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + fetched = 0xdeadbeef; + V_VT(&v) = VT_BOOL; + hres = IEnumVARIANT_Next(enum_var, 0, &v, &fetched); + ok_(__FILE__,line)(hres == S_OK, "Next returned %08x, expected S_FALSE\n", hres); + ok_(__FILE__,line)(fetched == 0, "fetched = %d\n", fetched); + ok_(__FILE__,line)(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); ok_(__FILE__,line)(hres == S_OK, "Skip failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLDOMChildrenCollection:: get__newEnum implementation.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 570d05ec7c68d9f3e95e737638f28b11a9d43862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570d05ec7c68d9f3e95e73763… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 22 16:23:22 2014 +0200 mshtml: Added IHTMLDOMChildrenCollection::get__newEnum implementation. --- dlls/mshtml/htmlnode.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 168 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 00468d0..518448b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -48,6 +48,155 @@ typedef struct { nsIDOMNodeList *nslist; } HTMLDOMChildrenCollection; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLDOMChildrenCollection *col; +} HTMLDOMChildrenCollectionEnum; + +static inline HTMLDOMChildrenCollectionEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMChildrenCollectionEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMChildrenCollectionEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IHTMLDOMChildrenCollection_Release(&This->col->IHTMLDOMChildrenCollection_iface); + heap_free(This); + } + + return ref; +} + +static ULONG get_enum_len(HTMLDOMChildrenCollectionEnum *This) +{ + ULONG len; + nsresult nsres; + + nsres = nsIDOMNodeList_GetLength(This->col->nslist, &len); + assert(nsres == NS_OK); + return len; +} + +static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + ULONG fetched = 0, len; + nsIDOMNode *nsnode; + HTMLDOMNode *node; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, pCeltFetched); + + len = get_enum_len(This); + + while(This->iter+fetched < len && fetched < celt) { + nsres = nsIDOMNodeList_Item(This->col->nslist, This->iter+fetched, &nsnode); + assert(nsres == NS_OK); + + hres = get_node(This->col->doc, nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) { + ERR("get_node failed: %08x\n", hres); + break; + } + + V_VT(rgVar+fetched) = VT_DISPATCH; + IHTMLDOMNode_AddRef(&node->IHTMLDOMNode_iface); + V_DISPATCH(rgVar+fetched) = (IDispatch*)&node->IHTMLDOMNode_iface; + fetched++; + } + + This->iter += fetched; + if(pCeltFetched) + *pCeltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + ULONG len; + + TRACE("(%p)->(%d)\n", This, celt); + + len = get_enum_len(This); + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Reset(IEnumVARIANT *iface) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLDOMChildrenCollectionEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLDOMChildrenCollectionEnum *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLDOMChildrenCollectionEnumVtbl = { + HTMLDOMChildrenCollectionEnum_QueryInterface, + HTMLDOMChildrenCollectionEnum_AddRef, + HTMLDOMChildrenCollectionEnum_Release, + HTMLDOMChildrenCollectionEnum_Next, + HTMLDOMChildrenCollectionEnum_Skip, + HTMLDOMChildrenCollectionEnum_Reset, + HTMLDOMChildrenCollectionEnum_Clone +}; + static inline HTMLDOMChildrenCollection *impl_from_IHTMLDOMChildrenCollection(IHTMLDOMChildrenCollection *iface) { return CONTAINING_RECORD(iface, HTMLDOMChildrenCollection, IHTMLDOMChildrenCollection_iface); @@ -146,11 +295,26 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenColle return S_OK; } -static HRESULT WINAPI HTMLDOMChildrenCollection__newEnum(IHTMLDOMChildrenCollection *iface, IUnknown **p) +static HRESULT WINAPI HTMLDOMChildrenCollection_get__newEnum(IHTMLDOMChildrenCollection *iface, IUnknown **p) { HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLDOMChildrenCollectionEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLDOMChildrenCollectionEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + IHTMLDOMChildrenCollection_AddRef(&This->IHTMLDOMChildrenCollection_iface); + ret->col = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection *iface, LONG index, IDispatch **ppItem) @@ -196,7 +360,7 @@ static const IHTMLDOMChildrenCollectionVtbl HTMLDOMChildrenCollectionVtbl = { HTMLDOMChildrenCollection_GetIDsOfNames, HTMLDOMChildrenCollection_Invoke, HTMLDOMChildrenCollection_get_length, - HTMLDOMChildrenCollection__newEnum, + HTMLDOMChildrenCollection_get__newEnum, HTMLDOMChildrenCollection_item };

1 0

Jacek Caban : mshtml: Added IHTMLDOMChildrenCollection:: get__newEnum tests.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 12dc23db7269a0bea76958373393520ff0c1fe85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12dc23db7269a0bea76958373… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 22 16:23:35 2014 +0200 mshtml: Added IHTMLDOMChildrenCollection::get__newEnum tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3a6380a..2ab701e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6242,7 +6242,55 @@ static void test_child_col_disp(IHTMLDOMChildrenCollection *col) IDispatchEx_Release(dispex); } +static void test_enum_children(IUnknown *unk, unsigned len) +{ + IEnumVARIANT *enum_var; + ULONG i, fetched; + VARIANT v; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enum_var); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08x\n", hres); + + for(i=0; i<len; i++) { + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, i ? &fetched : NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(i) + ok(fetched == 1, "fetched = %d\n", fetched); + ok(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); + IDispatch_Release(V_DISPATCH(&v)); + } + + fetched = 0xdeadbeef; + V_VT(&v) = VT_BOOL; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_FALSE, "Next returned %08x, expected S_FALSE\n", hres); + ok(fetched == 0, "fetched = %d\n", fetched); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + hres = IEnumVARIANT_Reset(enum_var); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + fetched = 0xdeadbeef; + V_VT(&v) = VT_BOOL; + hres = IEnumVARIANT_Next(enum_var, 0, &v, &fetched); + ok(hres == S_OK, "Next returned %08x, expected S_FALSE\n", hres); + ok(fetched == 0, "fetched = %d\n", fetched); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); + ok(hres == S_OK, "Skip failed: %08x\n", hres); + + hres = IEnumVARIANT_Reset(enum_var); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + + hres = IEnumVARIANT_Skip(enum_var, len+1); + ok(hres == S_FALSE, "Skip failed: %08x\n", hres); + + IEnumVARIANT_Release(enum_var); +} static void test_elems(IHTMLDocument2 *doc) { @@ -6702,6 +6750,7 @@ static void test_elems(IHTMLDocument2 *doc) child_col = get_child_nodes((IUnknown*)elem); ok(child_col != NULL, "child_coll == NULL\n"); if(child_col) { + IUnknown *enum_unk; LONG length = 0; test_disp((IUnknown*)child_col, &DIID_DispDOMChildrenCollection, "[object]"); @@ -6753,6 +6802,13 @@ static void test_elems(IHTMLDocument2 *doc) test_child_col_disp(child_col); + hres = IHTMLDOMChildrenCollection_get__newEnum(child_col, &enum_unk); + ok(hres == S_OK, "get__newEnum failed: %08x\n", hres); + + test_enum_children(enum_unk, length); + + IUnknown_Release(enum_unk); + IHTMLDOMChildrenCollection_Release(child_col); }

1 0

Patrick Rudolph : user32: Check for valid cbSize in GetMonitorInfoA.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 8be5dd162c27c15712b0159f87eb2b2075e6382d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be5dd162c27c15712b0159f8… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Thu Apr 17 18:26:24 2014 +0200 user32: Check for valid cbSize in GetMonitorInfoA. --- dlls/user32/misc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 34e1d81..d9eec26 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -419,6 +419,9 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) MONITORINFOEXA *miA = (MONITORINFOEXA*)lpMonitorInfo; BOOL ret; + if((miA->cbSize != sizeof(MONITORINFOEXA)) && (miA->cbSize != sizeof(MONITORINFO))) + return FALSE; + miW.cbSize = sizeof(miW); ret = GetMonitorInfoW(hMonitor, (MONITORINFO*)&miW); @@ -427,7 +430,7 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) miA->rcMonitor = miW.rcMonitor; miA->rcWork = miW.rcWork; miA->dwFlags = miW.dwFlags; - if(miA->cbSize >= offsetof(MONITORINFOEXA, szDevice) + sizeof(miA->szDevice)) + if(miA->cbSize == sizeof(MONITORINFOEXA)) WideCharToMultiByte(CP_ACP, 0, miW.szDevice, -1, miA->szDevice, sizeof(miA->szDevice), NULL, NULL); return ret; }

1 0

Patrick Rudolph : user32/tests: Add tests for valid cbSize in GetMonitorInfoA.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 24c572874d7dff5ee4b27f43d33fbe6fae877ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c572874d7dff5ee4b27f43d… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Fri Apr 18 19:07:55 2014 +0200 user32/tests: Add tests for valid cbSize in GetMonitorInfoA. --- dlls/user32/tests/monitor.c | 54 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a2df20e..786edf3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -296,6 +296,31 @@ static void test_monitors(void) HMONITOR monitor, primary, nearest; POINT pt; RECT rc; + MONITORINFO mi; + MONITORINFOEXA miex; + BOOL ret; + DWORD i; + + static const struct + { + DWORD cbSize; + BOOL ret; + } testdatami[] = { + {0, FALSE}, + {sizeof(MONITORINFO)+1, FALSE}, + {sizeof(MONITORINFO)-1, FALSE}, + {sizeof(MONITORINFO), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, + }, + testdatamiex[] = { + {0, FALSE}, + {sizeof(MONITORINFOEXA)+1, FALSE}, + {sizeof(MONITORINFOEXA)-1, FALSE}, + {sizeof(MONITORINFOEXA), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, + }; if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) { @@ -351,8 +376,6 @@ static void test_monitors(void) nearest = primary; while (monitor != NULL) { - MONITORINFO mi; - BOOL ret; ok( monitor != primary, "got primary %p\n", monitor ); nearest = monitor; mi.cbSize = sizeof(mi); @@ -362,6 +385,33 @@ static void test_monitors(void) monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); } + /* tests for cbSize in MONITORINFO */ + monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + for (i = 0; i < (sizeof(testdatami) / sizeof(testdatami[0])); i++) + { + memset( &mi, 0, sizeof(mi) ); + mi.cbSize = testdatami[i].cbSize; + ret = pGetMonitorInfoA( monitor, &mi ); + ok( ret == testdatami[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + + /* tests for cbSize in MONITORINFOEXA */ + for (i = 0; i < (sizeof(testdatamiex) / sizeof(testdatamiex[0])); i++) + { + memset( &miex, 0, sizeof(miex) ); + miex.cbSize = testdatamiex[i].cbSize; + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miex ); + ok( ret == testdatamiex[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL );

1 0

Nikolay Sivov : netprofm/tests: Fix a test failure on Win7/ Win2008 systems.
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 3f0a24349c42b82d253cfcf4d3bba8b30e1a9dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0a24349c42b82d253cfcf4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 22 08:16:34 2014 +0400 netprofm/tests: Fix a test failure on Win7/Win2008 systems. --- dlls/netprofm/tests/list.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 453856f..1619d06 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -56,8 +56,9 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); - INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + /* INetworkCostManager is supported starting Win8 */ + hr = INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); + ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08x\n", hr ); if (hr == S_OK) { DWORD cost;

1 0

Nikolay Sivov : shlwapi: Implement SHRegCreateUSKeyA().
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: f1706b038700ffc7c154745af9b7be78ed943b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1706b038700ffc7c154745af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 22 08:50:04 2014 +0400 shlwapi: Implement SHRegCreateUSKeyA(). --- dlls/shlwapi/reg.c | 53 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 7fb71cf..1653b80 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -209,31 +209,48 @@ LONG WINAPI SHRegCloseUSKey( /************************************************************************* * SHRegCreateUSKeyA [SHLWAPI.@] * - * Create or open a user-specific registry key. - * - * PARAMS - * pszPath [I] Key name to create or open. - * samDesired [I] Wanted security access. - * hRelativeUSKey [I] Base path if pszPath is relative. NULL otherwise. - * phNewUSKey [O] Receives a handle to the new or opened key. - * dwFlags [I] Base key under which the key should be opened. - * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: Nonzero error code from winerror.h + * See SHRegCreateUSKeyW. */ -LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, - PHUSKEY phNewUSKey, DWORD dwFlags) +LONG WINAPI SHRegCreateUSKeyA(LPCSTR path, REGSAM samDesired, HUSKEY relative_key, + PHUSKEY new_uskey, DWORD flags) { - FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_a(pszPath), samDesired, - hRelativeUSKey, phNewUSKey, dwFlags); - return ERROR_SUCCESS; + WCHAR *pathW; + LONG ret; + + TRACE("(%s, 0x%08x, %p, %p, 0x%08x)\n", debugstr_a(path), samDesired, relative_key, + new_uskey, flags); + + if (path) + { + INT len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if (!pathW) + return ERROR_NOT_ENOUGH_MEMORY; + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); + } + else + pathW = NULL; + + ret = SHRegCreateUSKeyW(pathW, samDesired, relative_key, new_uskey, flags); + HeapFree(GetProcessHeap(), 0, pathW); + return ret; } /************************************************************************* * SHRegCreateUSKeyW [SHLWAPI.@] * - * See SHRegCreateUSKeyA. + * Create or open a user-specific registry key. + * + * PARAMS + * path [I] Key name to create or open. + * samDesired [I] Wanted security access. + * relative_key [I] Base path if 'path' is relative. NULL otherwise. + * new_uskey [O] Receives a handle to the new or opened key. + * flags [I] Base key under which the key should be opened. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Nonzero error code from winerror.h */ LONG WINAPI SHRegCreateUSKeyW(LPCWSTR path, REGSAM samDesired, HUSKEY relative_key, PHUSKEY new_uskey, DWORD flags)

1 0

Henri Verbeet : d3d8/tests: Use a separate device for depth_clamp_test().
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: 25d2de7b935b608205581066afff368d04c10c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d2de7b935b608205581066a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 22 09:02:12 2014 +0200 d3d8/tests: Use a separate device for depth_clamp_test(). --- dlls/d3d8/tests/visual.c | 53 +++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 482e7ec..56fa0ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2606,44 +2606,53 @@ done: * clipped when D3DPMISCCAPS_CLIPTLVERTS is set, clamped when it isn't. * - The viewport's MinZ/MaxZ is irrelevant for this. */ -static void depth_clamp_test(IDirect3DDevice8 *device) +static void depth_clamp_test(void) { - const struct tvertex quad1[] = + IDirect3DDevice8 *device; + D3DVIEWPORT8 vp; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct tvertex quad1[] = { { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, }; - const struct tvertex quad2[] = + static const struct tvertex quad2[] = { { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, }; - const struct tvertex quad3[] = + static const struct tvertex quad3[] = { {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, }; - const struct tvertex quad4[] = + static const struct tvertex quad4[] = { { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - const struct vertex quad5[] = + static const struct vertex quad5[] = { { -0.5f, 0.5f, 10.0f, 0xff14f914}, { 0.5f, 0.5f, 10.0f, 0xff14f914}, { -0.5f, -0.5f, 10.0f, 0xff14f914}, { 0.5f, -0.5f, 10.0f, 0xff14f914}, }; - const struct vertex quad6[] = + static const struct vertex quad6[] = { { -1.0f, 0.5f, 10.0f, 0xfff91414}, { 1.0f, 0.5f, 10.0f, 0xfff91414}, @@ -2651,10 +2660,18 @@ static void depth_clamp_test(IDirect3DDevice8 *device) { 1.0f, 0.25f, 10.0f, 0xfff91414}, }; - D3DVIEWPORT8 vp; - D3DCOLOR color; - D3DCAPS8 caps; - HRESULT hr; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); vp.X = 0; vp.Y = 0; @@ -2663,9 +2680,6 @@ static void depth_clamp_test(IDirect3DDevice8 *device) vp.MinZ = 0.0; vp.MaxZ = 7.5; - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetViewport(device, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); @@ -2747,10 +2761,11 @@ static void depth_clamp_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - vp.MinZ = 0.0; - vp.MaxZ = 1.0; - hr = IDirect3DDevice8_SetViewport(device, &vp); - ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void depth_buffer_test(void) @@ -5014,7 +5029,6 @@ START_TEST(visual) } test_sanity(device_ptr); - depth_clamp_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5022,6 +5036,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + depth_clamp_test(); lighting_test(); clear_test(); fog_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for test_sanity().
by Alexandre Julliard 22 Apr '14

22 Apr '14

Module: wine Branch: master Commit: a8248847f5863bef1f830f5cb9a3377afeb50f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8248847f5863bef1f830f5cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 22 09:02:13 2014 +0200 d3d8/tests: Use a separate device for test_sanity(). --- dlls/d3d8/tests/visual.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 56fa0ca..41486c0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -152,11 +152,25 @@ struct nvertex DWORD diffuse; }; -static void test_sanity(IDirect3DDevice8 *device) +static void test_sanity(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = getPixelColor(device, 1, 1); @@ -172,6 +186,12 @@ static void test_sanity(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void lighting_test(void) @@ -4997,10 +5017,7 @@ done: START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; - IDirect3DDevice8 *device_ptr; IDirect3D8 *d3d; - ULONG refcount; - HWND window; HRESULT hr; if (!(d3d = Direct3DCreate8(D3D_SDK_VERSION))) @@ -5020,22 +5037,9 @@ START_TEST(visual) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - if (!(device_ptr = create_device(d3d, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - goto cleanup; - } - - test_sanity(device_ptr); - - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left.\n", refcount); -cleanup: IDirect3D8_Release(d3d); - DestroyWindow(window); + test_sanity(); depth_clamp_test(); lighting_test(); clear_test();

1 0