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

Nikolay Sivov : msxml3: Implement getValueFromQName() for MXAttributes.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 72187762a3fc2a5c11c747c3e0eed0fd9eb4f74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72187762a3fc2a5c11c747c3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 15 09:58:34 2012 +0300 msxml3: Implement getValueFromQName() for MXAttributes. --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++---- dlls/msxml3/tests/saxreader.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3bb4c7a..f0e4b75 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1873,12 +1873,23 @@ static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, cons return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR * pQName, - int nQName, const WCHAR ** pValue, int * nValue) +static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR *qname, + int qname_len, const WCHAR **value, int *value_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %p %p): stub\n", This, debugstr_wn(pQName, nQName), nQName, pValue, nValue); - return E_NOTIMPL; + HRESULT hr; + int index; + + TRACE("(%p)->(%s:%d %p %p)\n", This, debugstr_wn(qname, qname_len), qname_len, value, value_len); + + if (!qname || !value || !value_len) + return (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3) ? E_POINTER : E_INVALIDARG; + + hr = ISAXAttributes_getIndexFromQName(iface, qname, qname_len, &index); + if (hr == S_OK) + hr = ISAXAttributes_getValue(iface, index, value, value_len); + + return hr; } static const ISAXAttributesVtbl SAXAttributesVtbl = { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e9cfda8..15dfe41 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3437,6 +3437,40 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getIndexFromQName(saxattr, _bstr_(table->qname), strlen(table->qname)-1, &index); EXPECT_HR(hr, E_INVALIDARG); ok(index == -1, "%d: got wrong index %d\n", i, index); + + if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes40) || + IsEqualGUID(table->clsid, &CLSID_SAXAttributes60)) + { + hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); + } + else + { + hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + /* versions 4 and 6 crash */ + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, &len); + EXPECT_HR(hr, E_POINTER); + } + + hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &value, &len); + EXPECT_HR(hr, S_OK); } len = -1;

1 0

Jacek Caban : ieframe: Use Custom IEnumOLEVERBVtbl implementation in IOleObject::EnumVerbs.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: bae8f52b5b74be991fc4ddc6baf589fa1a4cd91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae8f52b5b74be991fc4ddc6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 13:10:37 2012 +0100 ieframe: Use Custom IEnumOLEVERBVtbl implementation in IOleObject::EnumVerbs. OleRegEnumVerbs can't work because CLSID_WebBrowser doesn't have required registries set --- dlls/ieframe/oleobject.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 3906f85..601e458 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -290,6 +290,102 @@ static void release_client_site(WebBrowser *This) } } +typedef struct { + IEnumOLEVERB IEnumOLEVERB_iface; + + LONG ref; +} EnumOLEVERB; + +static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) +{ + return CONTAINING_RECORD(iface, EnumOLEVERB, IEnumOLEVERB_iface); +} + +static HRESULT WINAPI EnumOLEVERB_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumOLEVERB_iface; + }else if(IsEqualGUID(&IID_IEnumOLEVERB, riid)) { + TRACE("(%p)->(IID_IEnumOLEVERB %p)\n", This, ppv); + *ppv = &This->IEnumOLEVERB_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumOLEVERB_AddRef(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumOLEVERB_Release(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB *rgelt, ULONG *pceltFetched) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + + if(pceltFetched) + *pceltFetched = 0; + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Skip(IEnumOLEVERB *iface, ULONG celt) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)->(%u)\n", This, celt); + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Reset(IEnumOLEVERB *iface) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)\n", This); + return S_OK; +} + +static HRESULT WINAPI EnumOLEVERB_Clone(IEnumOLEVERB *iface, IEnumOLEVERB **ppenum) +{ + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumOLEVERBVtbl EnumOLEVERBVtbl = { + EnumOLEVERB_QueryInterface, + EnumOLEVERB_AddRef, + EnumOLEVERB_Release, + EnumOLEVERB_Next, + EnumOLEVERB_Skip, + EnumOLEVERB_Reset, + EnumOLEVERB_Clone +}; + /********************************************************************** * Implement the IOleObject interface for the WebBrowser control */ @@ -491,8 +587,19 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEnumOleVerb) { WebBrowser *This = impl_from_IOleObject(iface); + EnumOLEVERB *ret; + TRACE("(%p)->(%p)\n", This, ppEnumOleVerb); - return OleRegEnumVerbs(&CLSID_WebBrowser, ppEnumOleVerb); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERBVtbl; + ret->ref = 1; + + *ppEnumOleVerb = &ret->IEnumOLEVERB_iface; + return S_OK; } static HRESULT WINAPI OleObject_Update(IOleObject *iface)

1 0

Jacek Caban : mshtml: Get rid of remaining PRBool usages.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 4983a663a5182c084b2b15e7f08928c346181b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4983a663a5182c084b2b15e7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 11:55:01 2012 +0100 mshtml: Get rid of remaining PRBool usages. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/editor.c | 14 +++++++------- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/mutation.c | 8 ++++---- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsiface.idl | 1 - dlls/mshtml/selection.c | 2 +- dlls/mshtml/txtrange.c | 10 +++++----- 14 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4983a663a5182c084b2b1…

1 0

Aric Stewart : strmbase: Move the MediaSeekingPassThru functions from quartz into strmbase.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 026037ab699faef6683dcec40cf0835dbe034691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026037ab699faef6683dcec40… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 14 14:45:34 2012 -0500 strmbase: Move the MediaSeekingPassThru functions from quartz into strmbase. --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avisplit.c | 1 - dlls/quartz/control_private.h | 28 -------------- dlls/quartz/dsoundrender.c | 9 ++--- dlls/quartz/main.c | 5 +++ dlls/quartz/mpegsplit.c | 1 - dlls/quartz/nullrenderer.c | 7 +--- dlls/quartz/quartz_private.h | 1 - dlls/quartz/videorenderer.c | 8 +--- dlls/quartz/waveparser.c | 1 - dlls/strmbase/Makefile.in | 1 + dlls/{quartz/control.c => strmbase/pospass.c} | 49 +++++++++++++++++++------ include/wine/strmbase.h | 8 ++++ 13 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026037ab699faef6683dc…

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DVolume8Impl_QueryInterface ().
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 9193215d41df60ad20fe6eacedff6721c829cc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9193215d41df60ad20fe6eace… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:29 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DVolume8Impl_QueryInterface(). --- dlls/d3d8/volume.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 0e009ee..ea69e12 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -31,18 +31,18 @@ static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, void **ppobj) { - IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DVolume8)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolume8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DSwapChain8Impl_QueryInterface ().
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: ddfb19e913b145e237ddb4d771bb8e6649c81c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfb19e913b145e237ddb4d77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:31 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DSwapChain8Impl_QueryInterface(). --- dlls/d3d8/swapchain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 3704130..8979519 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -31,18 +31,18 @@ static inline IDirect3DSwapChain8Impl *impl_from_IDirect3DSwapChain8(IDirect3DSw static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(IDirect3DSwapChain8 *iface, REFIID riid, void **ppobj) { - IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DSwapChain8)) { + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Ken Thomases : gdi.exe16: Eliminate a couple of dead stores.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 96720df53f181a940265967c6ca60a89b4a1a790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96720df53f181a940265967c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 14 15:12:17 2012 -0500 gdi.exe16: Eliminate a couple of dead stores. --- dlls/gdi.exe16/printdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index c1665f5..cab30c7 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -398,7 +398,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) INT16 WINAPI CloseJob16(HPJOB16 hJob) { int nRet = SP_ERROR; - PPRINTJOB pPrintJob = NULL; + PPRINTJOB pPrintJob; TRACE("%04x\n", hJob); @@ -418,7 +418,7 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob) INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch) { int nRet = SP_ERROR; - PPRINTJOB pPrintJob = NULL; + PPRINTJOB pPrintJob; TRACE("%04x %p %04x\n", hJob, lpData, cch);

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface ().
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 42672f6dbe28006d7685d2fa88c5e2db37d4ff16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42672f6dbe28006d7685d2fa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:30 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface(). --- dlls/d3d8/texture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f3f2b20..b1eb69a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -32,20 +32,20 @@ static inline IDirect3DTexture8Impl *impl_from_IDirect3DTexture8(IDirect3DTextur static HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(IDirect3DTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) - || IsEqualGUID(riid, &IID_IDirect3DTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DTexture8) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Piotr Caban : urlmon: Added GetBindResult implementation.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: f0aad940b5fc02696f302f6b035a9fbe0e768d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0aad940b5fc02696f302f6b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 15 12:07:30 2012 +0100 urlmon: Added GetBindResult implementation. --- dlls/urlmon/binding.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c969eae..159dca4 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -92,6 +92,7 @@ typedef struct { BOOL use_cache_file; DWORD state; HRESULT hres; + CLSID clsid; download_state_t download_state; IUnknown *obj; IMoniker *mon; @@ -178,8 +179,8 @@ static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) if(!(binding->state & BINDING_STOPPED)) { binding->state |= BINDING_STOPPED; - IBindStatusCallback_OnStopBinding(binding->callback, hres, str); binding->hres = hres; + IBindStatusCallback_OnStopBinding(binding->callback, hres, str); } } @@ -310,6 +311,7 @@ static void create_object(Binding *binding) heap_free(clsid_str); IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); + binding->clsid = CLSID_NULL; stop_binding(binding, hres, NULL); if(FAILED(hres)) @@ -881,8 +883,23 @@ static HRESULT WINAPI Binding_GetBindResult(IBinding *iface, CLSID *pclsidProtoc DWORD *pdwResult, LPOLESTR *pszResult, DWORD *pdwReserved) { Binding *This = impl_from_IBinding(iface); - FIXME("(%p)->(%p %p %p %p)\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p %p)\n", This, pclsidProtocol, pdwResult, pszResult, pdwReserved); + + if(!pdwResult || !pszResult || pdwReserved) + return E_INVALIDARG; + + if(!(This->state & BINDING_STOPPED)) { + *pclsidProtocol = CLSID_NULL; + *pdwResult = 0; + *pszResult = NULL; + return S_OK; + } + + *pclsidProtocol = This->hres==S_OK ? CLSID_NULL : This->clsid; + *pdwResult = This->hres; + *pszResult = NULL; + return S_OK; } static const IBindingVtbl BindingVtbl = { @@ -983,6 +1000,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_PROTOCOLCLASSID: + CLSIDFromString(szStatusText, &This->clsid); break; case BINDSTATUS_MIMETYPEAVAILABLE: case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE:

1 0

Dmitry Timoshkov : advapi32: Fix failures in the security tests compiled with PSDK headers.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: c25b0718987962889eff8171f94bdbf43e60efff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25b0718987962889eff8171f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 15 16:11:06 2012 +0800 advapi32: Fix failures in the security tests compiled with PSDK headers. --- dlls/advapi32/tests/security.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c3de8e4..7c5303d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -35,6 +35,9 @@ #include "wine/test.h" +/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -2545,7 +2548,7 @@ static void test_process_security(void) /* Doesn't matter what ACL say we should get full access for ourselves */ res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); ok(res, "CreateProcess with err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); @@ -2597,7 +2600,7 @@ static void test_process_security_child(void) ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); CloseHandle( handle ); @@ -2606,7 +2609,7 @@ static void test_process_security_child(void) ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, TRUE, 0 ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION ); ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_VM_READ, TRUE, 0 );

1 0