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

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

March 15, 2012

Module: wine Branch: master Commit: 5ca254f703932d12d530312806f8778d93d3fb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca254f703932d12d53031280… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 15 12:07:46 2012 +0100 urlmon/tests: Added GetBindResult tests. --- dlls/urlmon/tests/url.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f9e7cb5..c8c2a63 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1593,6 +1594,9 @@ static HRESULT WINAPI statusclb_OnStartBinding(IBindStatusCallbackEx *iface, DWO IWinInetHttpInfo *http_info; HRESULT hres; IMoniker *mon; + DWORD res; + CLSID clsid; + LPOLESTR res_str; if(iface == &objbsc) CHECK_EXPECT(Obj_OnStartBinding); @@ -1617,6 +1621,23 @@ static HRESULT WINAPI statusclb_OnStartBinding(IBindStatusCallbackEx *iface, DWO hres = IBinding_QueryInterface(pib, &IID_IWinInetHttpInfo, (void**)&http_info); ok(hres == E_NOINTERFACE, "Could not get IID_IWinInetHttpInfo: %08x\n", hres); + if(0) { /* crashes with native urlmon */ + hres = IBinding_GetBindResult(pib, NULL, &res, &res_str, NULL); + ok(hres == E_INVALIDARG, "GetBindResult failed: %08x\n", hres); + } + hres = IBinding_GetBindResult(pib, &clsid, NULL, &res_str, NULL); + ok(hres == E_INVALIDARG, "GetBindResult failed: %08x\n", hres); + hres = IBinding_GetBindResult(pib, &clsid, &res, NULL, NULL); + ok(hres == E_INVALIDARG, "GetBindResult failed: %08x\n", hres); + hres = IBinding_GetBindResult(pib, &clsid, &res, &res_str, (void*)0xdeadbeef); + ok(hres == E_INVALIDARG, "GetBindResult failed: %08x\n", hres); + + hres = IBinding_GetBindResult(pib, &clsid, &res, &res_str, NULL); + ok(hres == S_OK, "GetBindResult failed: %08x, expected S_OK\n", hres); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "incorrect clsid: %s\n", debugstr_guid(&clsid)); + ok(!res, "incorrect res: %x\n", res); + ok(!res_str, "incorrect res_str: %s\n", wine_dbgstr_w(res_str)); + if(abort_start) { binding_hres = abort_hres; return abort_hres; @@ -1858,6 +1879,50 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok(hresult == binding_hres, "binding failed: %08x, expected %08x\n", hresult, binding_hres); ok(szError == NULL, "szError should be NULL\n"); + if(current_binding) { + CLSID clsid; + DWORD res; + LPOLESTR res_str; + HRESULT hres; + + hres = IBinding_GetBindResult(current_binding, &clsid, &res, &res_str, NULL); + ok(hres == S_OK, "GetBindResult failed: %08x, expected S_OK\n", hres); + ok(res == hresult, "res = %08x, expected %08x\n", res, binding_hres); + ok(!res_str, "incorrect res_str = %s\n", wine_dbgstr_w(res_str)); + + if(hresult==S_OK || (abort_start && hresult!=S_FALSE)) { + ok(IsEqualCLSID(&clsid, &CLSID_NULL), + "incorrect protocol CLSID: %s, expected CLSID_NULL\n", + debugstr_guid(&clsid)); + }else if(emulate_protocol) { + todo_wine ok(IsEqualCLSID(&clsid, &CLSID_FtpProtocol), + "incorrect protocol CLSID: %s, expected CLSID_FtpProtocol\n", + debugstr_guid(&clsid)); + }else if(test_protocol == FTP_TEST) { + ok(IsEqualCLSID(&clsid, &CLSID_FtpProtocol), + "incorrect protocol CLSID: %s, expected CLSID_FtpProtocol\n", + debugstr_guid(&clsid)); + }else if(test_protocol == FILE_TEST) { + ok(IsEqualCLSID(&clsid, &CLSID_FileProtocol), + "incorrect protocol CLSID: %s, expected CLSID_FileProtocol\n", + debugstr_guid(&clsid)); + }else if(test_protocol == HTTP_TEST) { + ok(IsEqualCLSID(&clsid, &CLSID_HttpProtocol), + "incorrect protocol CLSID: %s, expected CLSID_HttpProtocol\n", + debugstr_guid(&clsid)); + }else if(test_protocol == HTTPS_TEST) { + ok(IsEqualCLSID(&clsid, &CLSID_HttpSProtocol), + "incorrect protocol CLSID: %s, expected CLSID_HttpSProtocol\n", + debugstr_guid(&clsid)); + }else if(test_protocol == ABOUT_TEST) { + ok(IsEqualCLSID(&clsid, &CLSID_AboutProtocol), + "incorrect protocol CLSID: %s, expected CLSID_AboutProtocol\n", + debugstr_guid(&clsid)); + }else { + ok(0, "unexpected (%d)\n", test_protocol); + } + } + if((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) && emulate_protocol) { SetEvent(complete_event); if(iface != &objbsc)

1 0

Jacek Caban : mshtml: Get rid of PRBool in nsiface.idl.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: f0b86d061bf5381d76cd96aea63a444c1d54bc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b86d061bf5381d76cd96aea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 11:54:15 2012 +0100 mshtml: Get rid of PRBool in nsiface.idl. --- dlls/mshtml/nsiface.idl | 753 ++++++++++++++++++++++++----------------------- 1 files changed, 377 insertions(+), 376 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0b86d061bf5381d76cd9…

1 0

Jacek Caban : mshtml: Get rid of PRBool from nsio.c.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: d6e76a1619ddb5c7cce5d62f1ccefea36bca11d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e76a1619ddb5c7cce5d62f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 11:54:33 2012 +0100 mshtml: Get rid of PRBool from nsio.c. --- dlls/mshtml/nsio.c | 62 ++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e76a1619ddb5c7cce5d…

1 0

Jacek Caban : mshtml: Get rid of PRBool from nsembed.c and nsservice.c.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: d1a116fae4916e0fdd15c1f3bd4cd57326d7b379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a116fae4916e0fdd15c1f3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 15 11:54:48 2012 +0100 mshtml: Get rid of PRBool from nsembed.c and nsservice.c. --- dlls/mshtml/nsembed.c | 30 +++++++++++++++--------------- dlls/mshtml/nsservice.c | 24 ++++++++++++------------ 2 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1a116fae4916e0fdd15c…

1 0

Aric Stewart : strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming .
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: cdf9c4f223ee3840c9fd92d0bfffa91005a817f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf9c4f223ee3840c9fd92d0b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 14 14:45:42 2012 -0500 strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming. --- dlls/quartz/dsoundrender.c | 8 ++++---- dlls/quartz/nullrenderer.c | 8 ++++---- dlls/quartz/videorenderer.c | 8 ++++---- dlls/strmbase/pospass.c | 6 +++--- include/wine/strmbase.h | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5e7dcc6..6e51cc4 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -386,7 +386,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa } if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart); hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) { ERR("Cannot get sample time (%x)\n", hr); @@ -670,7 +670,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) This->writepos = This->buf_size; SetEvent(This->state_change); SetEvent(This->blocked); - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->filter.csFilter); @@ -922,7 +922,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) } hr = DSoundRender_HandleEndOfStream(me); - MediaSeekingPassThru_EOS(me->seekthru_unk); + RendererPosPassThru_EOS(me->seekthru_unk); SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec); @@ -977,7 +977,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) QualityControlRender_Start(&pFilter->qcimpl, pFilter->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); - MediaSeekingPassThru_ResetMediaTime(pFilter->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pFilter->seekthru_unk); return hr; } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index b99624a..dc1bd0f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa TRACE("%p %p\n", pin, pSample); if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, start); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, start); EnterCriticalSection(&This->filter.csFilter); if (This->pInputPin->flushing || This->pInputPin->end_of_stream) hr = S_FALSE; @@ -308,7 +308,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface) EnterCriticalSection(&This->filter.csFilter); { This->filter.state = State_Stopped; - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); } LeaveCriticalSection(&This->filter.csFilter); @@ -428,7 +428,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) IMediaEventSink_Release(pEventSink); } } - MediaSeekingPassThru_EOS(pNull->seekthru_unk); + RendererPosPassThru_EOS(pNull->seekthru_unk); return hr; } @@ -443,7 +443,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface) hr = BaseInputPinImpl_EndOfStream(iface); pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter; - MediaSeekingPassThru_ResetMediaTime(pNull->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pNull->seekthru_unk); return hr; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index c064f80..92a0c99 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -390,7 +390,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS } if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); + RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart); /* Preroll means the sample isn't shown, this is used for key frames and things like that */ if (IMediaSample_IsPreroll(pSample) == S_OK) { @@ -776,7 +776,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) This->filter.state = State_Stopped; SetEvent(This->hEvent); SetEvent(This->blocked); - MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + RendererPosPassThru_ResetMediaTime(This->seekthru_unk); if (This->AutoShow) /* Black it out */ RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); @@ -928,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pFilter); IMediaEventSink_Release(pEventSink); } - MediaSeekingPassThru_EOS(pFilter->seekthru_unk); + RendererPosPassThru_EOS(pFilter->seekthru_unk); This->end_of_stream = 1; out: LeaveCriticalSection(This->pin.pCritSec); @@ -973,7 +973,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); - MediaSeekingPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); + RendererPosPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); return hr; } diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index cba4b28..90a87e1 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -567,7 +567,7 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON return hr; } -HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); EnterCriticalSection(&This->time_cs); @@ -577,7 +577,7 @@ HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE return S_OK; } -HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); EnterCriticalSection(&This->time_cs); @@ -586,7 +586,7 @@ HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) return S_OK; } -HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface) +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface) { ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); REFERENCE_TIME time; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b2319d2..89b1898 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -321,9 +321,9 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); /* PosPassThru */ -HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); -HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface); -HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru); HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru);

1 0

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

March 15, 2012

Module: wine Branch: master Commit: 8c2d44cafeaaeecca73346aaf0f0cbf9614abbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2d44cafeaaeecca73346aaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:28 2012 +0100 d3d8: Don't return a pointer to the implementation in IDirect3DVolumeTexture8Impl_QueryInterface(). --- dlls/d3d8/volumetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index a713f16..3d51734 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -31,20 +31,20 @@ static inline IDirect3DVolumeTexture8Impl *impl_from_IDirect3DVolumeTexture8(IDi static HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(IDirect3DVolumeTexture8 *iface, REFIID riid, void **ppobj) { - IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(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_IDirect3DVolumeTexture8)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture8) + || 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

Henri Verbeet : ddraw: Get rid of IDirect3DViewportImpl.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 0c11c316bbf10432d31af38862f0da3e03b671fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c11c316bbf10432d31af3886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 22:04:32 2012 +0100 ddraw: Get rid of IDirect3DViewportImpl. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 19 ++-- dlls/ddraw/device.c | 30 ++-- dlls/ddraw/executebuffer.c | 12 +- dlls/ddraw/viewport.c | 305 +++++++++++++++++++------------------------- 5 files changed, 161 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c11c316bbf10432d31af…

1 0

Dmitry Timoshkov : advapi32: Add some mutex security tests.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 23fa5c43fa5fde7b65ad3867126035c79fc1b038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fa5c43fa5fde7b65ad38671… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 15 16:10:42 2012 +0800 advapi32: Add some mutex security tests. --- dlls/advapi32/tests/security.c | 176 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 176 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c8db437..c3de8e4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3983,6 +3983,181 @@ static void test_CreateRestrictedToken(void) CloseHandle(process_token); } +static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) +{ + BOOL ret, present, defaulted; + ACL *acl; + void *sid; + + present = -1; + defaulted = -1; + acl = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); +todo_wine + ok(present == 1, "acl is not present\n"); +todo_wine + ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); +} + +static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) +{ + DWORD ret, length, needed, granted, priv_set_len; + BOOL status; + PRIVILEGE_SET priv_set; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok(!ret, "GetKernelObjectSecurity should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok(needed == length, "GetKernelObjectSecurity should return required buffer length\n"); + + validate_default_security_descriptor(sd); + + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, MAXIMUM_ALLOWED, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); +} + HeapFree(GetProcessHeap(), 0, sd); +} + +static void test_mutex_security(HANDLE token) +{ + HANDLE mutex; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + mutex = OpenMutex(0, FALSE, "WineTestMutex"); + ok(!mutex, "mutex should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + mutex = CreateMutex(NULL, FALSE, "WineTestMutex"); + ok(mutex != 0, "CreateMutex error %d\n", GetLastError()); + + test_default_handle_security(token, mutex, &mapping); + + CloseHandle (mutex); +} + +static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) +{ + DWORD ret, needed; + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL sil; + + type = 0xdeadbeef; + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenType, &type, sizeof(type), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(type), "GetTokenInformation should return required buffer length\n"); + ok(type == TokenPrimary || type == TokenImpersonation, "expected TokenPrimary or TokenImpersonation, got %d\n", type); + + *token_type = type; + if (type != TokenImpersonation) return FALSE; + + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenImpersonationLevel, &sil, sizeof(sil), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(sil), "GetTokenInformation should return required buffer length\n"); + ok(sil == SecurityImpersonation, "expected SecurityImpersonation, got %d\n", sil); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenDefaultDacl, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_DEFAULT_DACL), "GetTokenInformation returned empty default DACL\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_OWNER), "GetTokenInformation returned empty token owner\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_PRIMARY_GROUP), "GetTokenInformation returned empty token primary group\n"); + + return TRUE; +} + +static void test_kernel_objects_security(void) +{ + HANDLE token, process_token; + DWORD ret, token_type; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token); + ok(ret, "OpenProcessToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(process_token, &token_type); + ok(token_type == TokenPrimary, "expected TokenPrimary, got %d\n", token_type); + ok(!ret, "access token should not be an impersonation token\n"); + + ret = DuplicateToken(process_token, SecurityImpersonation, &token); + ok(ret, "DuplicateToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(token, &token_type); + ok(ret, "access token should be a valid impersonation token\n"); + ok(token_type == TokenImpersonation, "expected TokenImpersonation, got %d\n", token_type); + + test_mutex_security(token); + /* FIXME: test other kernel object types */ + + CloseHandle(process_token); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -3993,6 +4168,7 @@ START_TEST(security) test_process_security_child(); return; } + test_kernel_objects_security(); test_sid(); test_trustee(); test_luid();

1 0

Alexandre Julliard : Release 1.4.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: docs Branch: master Commit: 5492f86b03ab0be141873c907a07f8c58ac111fb URL: http://source.winehq.org/git/docs.git/?a=commit;h=5492f86b03ab0be141873c907… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 20:00:07 2012 +0100 Release 1.4. --- ANNOUNCE | 95 ++++++------------- VERSION | 2 +- configure | 306 ++++++++++++++++++++++++++++++++++-------------------------- 3 files changed, 203 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=5492f86b03ab0be141873…

1 0

Tag wine-docs-1.4 : Alexandre Julliard : Release 1.4
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: docs Branch: refs/tags/wine-docs-1.4 Tag: 60b9e687206f58e1b617cdc7bb0e97b3bb178472 URL: http://source.winehq.org/git/docs.git/?a=tag;h=60b9e687206f58e1b617cdc7bb0e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 20:00:07 2012 +0100 Release 1.4

1 0