March 2014 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : include: Add interface INetCfgLock.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 1db600d44badeccc8e16ba8cfbd7bc1e96d267d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db600d44badeccc8e16ba8cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 11:54:32 2014 +1100 include: Add interface INetCfgLock. --- include/netcfgx.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/netcfgx.idl b/include/netcfgx.idl index 75c0a94..d51407f 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -26,6 +26,9 @@ import "wtypes.idl"; #define vi_progid(str) #endif +cpp_quote("#define NETCFG_E_ALREADY_INITIALIZED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xA020)") +cpp_quote("#define NETCFG_E_NO_WRITE_LOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xA024)") + [ local, object, @@ -91,6 +94,20 @@ interface IEnumNetCfgComponent : IUnknown [ local, object, + uuid(c0e8ae9f-306e-11d1-aacf-00805fc1270e), + pointer_default(unique) +] +interface INetCfgLock : IUnknown +{ + HRESULT AcquireWriteLock ([in] DWORD cmsTimeout, [in] LPCWSTR pszwClientDescription, + [out] LPWSTR* ppszwClientDescription); + HRESULT ReleaseWriteLock (); + HRESULT IsWriteLocked ([out] LPWSTR* ppszwClientDescription); +}; + +[ + local, + object, uuid(c0e8ae93-306e-11d1-aacf-00805fc1270e), pointer_default(unique) ]

1 0

Jactry Zeng : riched20: Return E_INVALIDARG for empty ppSel in ITextDocument::GetSelection.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: c5bd5236b924e4e21c85aa3262cbe49339b893ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bd5236b924e4e21c85aa326… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Mar 25 23:53:59 2014 +0800 riched20: Return E_INVALIDARG for empty ppSel in ITextDocument::GetSelection. --- dlls/riched20/richole.c | 3 +++ dlls/riched20/tests/richole.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6805873..bec228e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -515,6 +515,9 @@ ITextDocument_fnGetSelection(ITextDocument* me, ITextSelection** ppSel) { IRichEditOleImpl *This = impl_from_ITextDocument(me); TRACE("(%p)\n", me); + + if(!ppSel) + return E_INVALIDARG; *ppSel = &This->txtSel->ITextSelection_iface; ITextSelection_AddRef(*ppSel); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5bfb999..5a3ffbe 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -117,6 +117,9 @@ static void test_Interfaces(void) ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); + hres = ITextDocument_GetSelection(txtDoc, NULL); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres); + ITextDocument_GetSelection(txtDoc, &txtSel); punk = NULL;

1 0

Javier Cantero : user32: Fix side effect in SubtractRect().
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 1f15169f725894edfa2f33e16b8827d3d2c11a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f15169f725894edfa2f33e16… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Thu Mar 20 16:07:32 2014 +0100 user32: Fix side effect in SubtractRect(). --- dlls/user32/uitools.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c11a1d3..1afb1c89 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1421,14 +1421,14 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) SetRectEmpty( dest ); return FALSE; } - *dest = *src1; if (IntersectRect( &tmp, src1, src2 )) { - if (EqualRect( &tmp, dest )) + if (EqualRect( &tmp, src1 )) { SetRectEmpty( dest ); return FALSE; } + *dest = *src1; if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom)) { if (tmp.left == dest->left) dest->left = tmp.right; @@ -1440,6 +1440,10 @@ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) else if (tmp.bottom == dest->bottom) dest->bottom = tmp.top; } } + else + { + *dest = *src1; + } return TRUE; }

1 0

Alexandre Julliard : ntdll: Heap handles should be 64K-aligned.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 395df1aa2d50dc4622e64b552c85fca200798b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=395df1aa2d50dc4622e64b552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 26 11:24:14 2014 +0100 ntdll: Heap handles should be 64K-aligned. --- dlls/kernel32/tests/alloc.c | 1 + dlls/ntdll/heap.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c index 05d262e..9de9528 100644 --- a/dlls/kernel32/tests/alloc.c +++ b/dlls/kernel32/tests/alloc.c @@ -69,6 +69,7 @@ static void test_Heap(void) */ memchunk=10*sysInfo.dwPageSize; heap=HeapCreate(0,2*memchunk,5*memchunk); + ok( !((ULONG_PTR)heap & 0xffff), "heap %p not 64K aligned\n", heap ); /* Check that HeapCreate allocated the right amount of ram */ mem1=HeapAlloc(heap,0,5*memchunk+1); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac78889..3bb7a11 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -879,7 +879,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK ); /* allocate the memory block */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &totalSize, + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { WARN("Could not allocate %08lx bytes\n", totalSize );

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::bgColor property implementation.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 946378a1b2911786f489c9942bd1a41c62c79fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946378a1b2911786f489c9942… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Mar 26 15:06:39 2014 +0800 mshtml: Added IHTMLTableRow::bgColor property implementation. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmltablerow.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 6c2bb7a..7117087 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -124,7 +124,7 @@ static int loose_hex_to_rgb(const WCHAR *hex) | comp_value(hex+2*dpc, dpc); } -static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) +HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { unsigned int i; int rgb = -1; @@ -155,7 +155,7 @@ static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) return S_OK; } -static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) +BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) { switch(V_VT(v)) { case VT_BSTR: diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index f93a606..f3a4970 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -170,15 +170,48 @@ static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + nsAString_InitDepend(&val, V_BSTR(&v)); + variant_to_nscolor(&v, &val); + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set BgColor(%s) failed!\n", debugstr_variant(&v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + HRESULT hres; + const PRUnichar *color; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strColor, NULL); + nsres = nsIDOMHTMLTableRowElement_GetBgColor(This->nsrow, &strColor); + nsAString_Finish(&strColor); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&strColor, &color); + V_VT(p) = VT_BSTR; + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("SetBgColor failed: %08x\n", nsres); + hres = E_FAIL; + } + + return hres; } static HRESULT WINAPI HTMLTableRow_put_borderColor(IHTMLTableRow *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 882f859..c40d773 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -862,6 +862,10 @@ HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HI HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; +BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) DECLSPEC_HIDDEN; +HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) DECLSPEC_HIDDEN; + + struct HTMLAttributeCollection { DispatchEx dispex; IHTMLAttributeCollection IHTMLAttributeCollection_iface; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2cb0087..76c283a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5578,6 +5578,7 @@ static void test_tr_elem(IHTMLElement *elem) HRESULT hres; BSTR bstr; LONG lval; + VARIANT vbg, vDefaultbg; static const elem_type_t cell_types[] = {ET_TD,ET_TD}; @@ -5628,6 +5629,40 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "get_sectionRowIndex failed: %08x\n", hres); ok(lval == 1, "get_sectionRowIndex returned %d\n", lval); + hres = IHTMLTableRow_get_bgColor(row, &vDefaultbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLTableRow_put_bgColor(row, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableRow_get_bgColor(row, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + V_VT(&vbg) = VT_I4; + V_I4(&vbg) = 0xff0000; + hres = IHTMLTableRow_put_bgColor(row, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableRow_get_bgColor(row, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Originial */ + hres = IHTMLTableRow_put_bgColor(row, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + IHTMLTableRow_Release(row); }

1 0

Stefan Leichter : wtsapi32: Extend the parameter check of WTSEnumerateProcessesW.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 0d2ff50e223eeeec253c31c15c1102b528e8dd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2ff50e223eeeec253c31c15… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Mar 25 22:53:26 2014 +0100 wtsapi32: Extend the parameter check of WTSEnumerateProcessesW. --- dlls/wtsapi32/tests/wtsapi.c | 8 -------- dlls/wtsapi32/wtsapi32.c | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 0a5a1ed..e8dced7 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -45,41 +45,33 @@ static void test_WTSEnumerateProcessesW(void) info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); - todo_wine ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - todo_wine ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); if (info) WTSFreeMemory(info); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 314ec6b..79d5a7f 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -87,7 +87,11 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppProcessInfo, pCount); - if (!ppProcessInfo || !pCount) return FALSE; + if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } *pCount = 0; *ppProcessInfo = NULL;

1 0

Alistair Leslie-Hughes : netcfgx: Add INetCfgLock support.
by Alexandre Julliard March 26, 2014

March 26, 2014

Module: wine Branch: master Commit: 8a82aacec9fec20e948d1046ff941dbd8b0587be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a82aacec9fec20e948d1046f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 11:54:56 2014 +1100 netcfgx: Add INetCfgLock support. --- dlls/netcfgx/netcfg.c | 75 ++++++++++++++++++++++++++++++++++++++++-- dlls/netcfgx/tests/netcfgx.c | 27 +++++++++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/netcfgx/netcfg.c b/dlls/netcfgx/netcfg.c index 8653d29..43db0ef 100644 --- a/dlls/netcfgx/netcfg.c +++ b/dlls/netcfgx/netcfg.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL( netcfgx ); typedef struct NetConfiguration { INetCfg INetCfg_iface; + INetCfgLock INetCfgLock_iface; + LONG ref; } NetConfiguration; @@ -38,14 +40,24 @@ static inline NetConfiguration *impl_from_INetCfg(INetCfg *iface) return CONTAINING_RECORD(iface, NetConfiguration, INetCfg_iface); } +static inline NetConfiguration *impl_from_INetCfgLock(INetCfgLock *iface) +{ + return CONTAINING_RECORD(iface, NetConfiguration, INetCfgLock_iface); +} + static HRESULT WINAPI netcfg_QueryInterface(INetCfg *iface, REFIID riid, void **ppvObject) { - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + NetConfiguration *This = impl_from_INetCfg(iface); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_INetCfg) || IsEqualGUID(riid, &IID_IUnknown)) { - *ppvObject = iface; + *ppvObject = &This->INetCfg_iface; + } + else if(IsEqualGUID(riid, &IID_INetCfgLock)) + { + *ppvObject = &This->INetCfgLock_iface; } else { @@ -53,7 +65,7 @@ static HRESULT WINAPI netcfg_QueryInterface(INetCfg *iface, REFIID riid, void ** return E_NOINTERFACE; } - INetCfg_AddRef( iface ); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -153,6 +165,62 @@ static const struct INetCfgVtbl NetCfgVtbl = netcfg_QueryNetCfgClass }; + +static HRESULT WINAPI netcfglock_QueryInterface(INetCfgLock *iface, REFIID riid,void **ppvObject) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + + return netcfg_QueryInterface(&This->INetCfg_iface, riid, ppvObject); +} + +static ULONG WINAPI netcfglock_AddRef(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + + return netcfg_AddRef(&This->INetCfg_iface); +} + +static ULONG WINAPI netcfglock_Release(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + return netcfg_Release(&This->INetCfg_iface); +} + +static HRESULT WINAPI netcfglock_AcquireWriteLock(INetCfgLock *iface, DWORD cmsTimeout, + LPCWSTR pszwClientDescription, LPWSTR *ppszwClientDescription) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p %d %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); + + return S_OK; +} + +static HRESULT WINAPI netcfglock_ReleaseWriteLock(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI netcfglock_IsWriteLocked(INetCfgLock *iface, LPWSTR *ppszwClientDescription) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p %p\n", This, ppszwClientDescription); + + return E_NOTIMPL; +} + +static const struct INetCfgLockVtbl NetCfgLockVtbl = +{ + netcfglock_QueryInterface, + netcfglock_AddRef, + netcfglock_Release, + netcfglock_AcquireWriteLock, + netcfglock_ReleaseWriteLock, + netcfglock_IsWriteLocked +}; + HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) { NetConfiguration *This; @@ -162,6 +230,7 @@ HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) return E_OUTOFMEMORY; This->INetCfg_iface.lpVtbl = &NetCfgVtbl; + This->INetCfgLock_iface.lpVtbl = &NetCfgLockVtbl; This->ref = 1; *ppUnk = (IUnknown*)This; diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 6427f85..2a9f0eb 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -26,17 +26,38 @@ void create_configuration(void) { static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; + static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; HRESULT hr; INetCfg *config = NULL; + INetCfgLock *netlock = NULL; INetCfgComponent *component = NULL; + LPWSTR client = NULL; hr = CoCreateInstance( &CLSID_CNetCfg, NULL, CLSCTX_ALL, &IID_INetCfg, (LPVOID*)&config); ok(hr == S_OK, "Failed to create object\n"); if(SUCCEEDED(hr)) { + hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + ok(hr == S_OK || + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + if(hr == S_OK) + { + trace("Lock value: %s\n", wine_dbgstr_w(client)); + CoTaskMemFree(client); + } + else if(hr == E_ACCESSDENIED) + trace("Not run with Admin permissions\n"); + hr = INetCfg_Initialize(config, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + /* AcquireWriteLock needs to be run before Initialize */ + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + hr = INetCfg_FindComponent(config, tcpipW, &component); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) @@ -44,9 +65,15 @@ void create_configuration(void) INetCfgComponent_Release(component); } + hr = INetCfg_Apply(config); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + hr = INetCfg_Uninitialize(config); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = INetCfgLock_ReleaseWriteLock(netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfg_Release(config); } }

1 0

Jacek Caban : dxgi1_2.idl: Added new file.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 9301c580d04aa0453d59a8013e1ad18bdc266eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9301c580d04aa0453d59a8013… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 16:41:41 2014 +0100 dxgi1_2.idl: Added new file. --- include/Makefile.in | 1 + include/dxgi1_2.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 525e4eb..ebdc96b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -39,6 +39,7 @@ PUBLIC_IDL_H_SRCS = \ dwrite.idl \ dwrite_1.idl \ dxgi.idl \ + dxgi1_2.idl \ endpointvolume.idl \ exdisp.idl \ fusion.idl \ diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl new file mode 100644 index 0000000..27dc34c --- /dev/null +++ b/include/dxgi1_2.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dxgi.idl"; + +typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { + DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1, + DXGI_OFFER_RESOURCE_PRIORITY_NORMAL, + DXGI_OFFER_RESOURCE_PRIORITY_HIGH +} DXGI_OFFER_RESOURCE_PRIORITY; + +[ + object, + uuid(05008617-fbfd-4051-a790-144884b4f6a9), + local, + pointer_default(unique) +] +interface IDXGIDevice2 : IDXGIDevice1 +{ + HRESULT OfferResources( + [in] UINT NumResources, + [in, size_is(NumResources)] IDXGIResource *const *ppResources, + [in] DXGI_OFFER_RESOURCE_PRIORITY Priority); + + HRESULT ReclaimResources( + [in] UINT NumResources, + [in, size_is(NumResources)] IDXGIResource *const *ppResources, + [out, size_is(NumResources)] BOOL *pDiscarded); + + HRESULT EnqueueSetEvent( + [in] HANDLE hEvent); +}

1 0

Hermès Bélusca-Maïto : usp10 : Avoid non-standard array initialization.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 8fb52c7c5d711918fadf2590061d668093d14708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb52c7c5d711918fadf25900… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Mar 25 14:31:16 2014 +0100 usp10: Avoid non-standard array initialization. --- dlls/usp10/bidi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index ceb498e..3962671 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -827,10 +827,13 @@ static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; - Run runs[uCount]; int run_count = 0; + Run *runs; IsolatedRun *current_isolated; + runs = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(Run)); + if (!runs) return; + list_init(set); /* Build Runs */ @@ -857,6 +860,7 @@ static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel int type_fence, real_end; int j; current_isolated = HeapAlloc(GetProcessHeap(), 0, sizeof(IsolatedRun) + sizeof(WORD*)*uCount); + if (!current_isolated) break; run_start = runs[k].start; current_isolated->e = runs[k].e; @@ -944,6 +948,8 @@ search: } i++; } + + HeapFree(GetProcessHeap(), 0, runs); } /*************************************************************

1 0

Markus Weiland : dxdiagn: Added properties for hardware acceleration capabilities.
by Alexandre Julliard March 25, 2014

March 25, 2014

Module: wine Branch: master Commit: 7462da1345e1ad9d4cb06339f1300271e658faa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7462da1345e1ad9d4cb06339f… Author: Markus Weiland <markusw(a)graph-ix.net> Date: Sun Mar 23 21:18:45 2014 -0400 dxdiagn: Added properties for hardware acceleration capabilities. --- dlls/dxdiagn/provider.c | 20 ++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 76bbcf0..451270c 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -915,10 +915,15 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node static const WCHAR id_fmtW[] = {'0','x','%','0','4','x',0}; static const WCHAR subsysid_fmtW[] = {'0','x','%','0','8','x',0}; static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; + D3DCAPS9 device_caps; DWORD available_mem = 0; + BOOL hardware_accel; snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); @@ -1043,6 +1048,21 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer); if (FAILED(hr)) goto cleanup; + + hr = IDirect3D9_GetDeviceCaps(pDirect3D9, index, D3DDEVTYPE_HAL, &device_caps); + hardware_accel = SUCCEEDED(hr); + + hr = add_bool_property(display_adapter, b3DAccelerationEnabled, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, b3DAccelerationExists, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel); + if (FAILED(hr)) + goto cleanup; } hr = S_OK; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 9959665..ce0fb77 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -938,6 +938,9 @@ static void test_DxDiag_DisplayDevices(void) static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const struct property_test property_tests[] = { @@ -959,6 +962,9 @@ static void test_DxDiag_DisplayDevices(void) {szRevisionId, VT_BSTR}, {dwRefreshRate, VT_UI4}, {szManufacturer, VT_BSTR}, + {b3DAccelerationExists, VT_BOOL}, + {b3DAccelerationEnabled, VT_BOOL}, + {bDDAccelerationEnabled, VT_BOOL}, }; IDxDiagContainer *display_cont = NULL;

1 0