November 2012 - Wine-commits

Nikolay Sivov : msxml3: Fix handling of NULL object site (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: b2643d3841118ea100df1bccc7b2f3148bfc2493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2643d3841118ea100df1bccc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 13:11:19 2012 -0500 msxml3: Fix handling of NULL object site (Coverity). --- dlls/msxml3/httprequest.c | 33 ++++++++++++++++++--------------- dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 2600ffe..9d93cca 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1444,34 +1444,37 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { httprequest *This = impl_from_IObjectWithSite(iface); - IServiceProvider *provider; - HRESULT hr; - - TRACE("(%p)->(%p)\n", iface, punk); - if (punk) - IUnknown_AddRef( punk ); + TRACE("(%p)->(%p)\n", This, punk); if(This->site) IUnknown_Release( This->site ); + SysFreeString(This->siteurl); + This->siteurl = NULL; This->site = punk; - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); - if (hr == S_OK) + if (punk) { - IHTMLDocument2 *doc; + IServiceProvider *provider; + HRESULT hr; + + IUnknown_AddRef( punk ); - hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); if (hr == S_OK) { - SysFreeString(This->siteurl); + IHTMLDocument2 *doc; - hr = IHTMLDocument2_get_URL(doc, &This->siteurl); - IHTMLDocument2_Release(doc); - TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); + hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + if (hr == S_OK) + { + hr = IHTMLDocument2_get_URL(doc, &This->siteurl); + IHTMLDocument2_Release(doc); + TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); + } + IServiceProvider_Release(provider); } - IServiceProvider_Release(provider); } return S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3a62c95..d75bb5f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5213,6 +5213,9 @@ todo_wine { EXPECT_REF(obj_site, 1); } + hr = IObjectWithSite_SetSite(obj_site, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IObjectWithSite_AddRef(obj_site); todo_wine { EXPECT_REF(obj_site, 2);

1 0

Nikolay Sivov : msxml3: Check return value (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: cf8564a992afc1a9eb9c37e4a272b3b987d59571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8564a992afc1a9eb9c37e4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 13:15:29 2012 -0500 msxml3: Check return value (Coverity). --- dlls/msxml3/tests/xmlview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index eb660e4..82577bf 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -123,9 +123,11 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R { if(dispIdMember == DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE) { static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + HRESULT hr; BSTR state; - IHTMLDocument2_get_readyState(html_doc, &state); + hr = IHTMLDocument2_get_readyState(html_doc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); if(!memcmp(state, completeW, sizeof(completeW))) loaded = TRUE; }

1 0

Piotr Caban : msvcrt: Remove superfluous semicolons.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: bdedab6c840c068d0fe4a761eb5045b72de9a91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdedab6c840c068d0fe4a761e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 28 12:01:02 2012 +0000 msvcrt: Remove superfluous semicolons. --- dlls/msvcrt/cpp.c | 20 ++++++++++---------- dlls/msvcrt/cxx.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ed5f751..ec0fa7df 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -666,16 +666,16 @@ __ASM_VTABLE(__non_rtti_object, } #endif -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); -DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ); -DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ); -DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ); -DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ); - -DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ); +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) +DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) +DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) +DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ) +DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) + +DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) void msvcrt_init_exception(void *base) { diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 8f9f96a..e649f03 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -107,7 +107,7 @@ const rtti_object_locator name ## _rtti = { \ 0, \ &name ## _type_info, \ &name ## _hierarchy \ -} +}; #else

1 0

Piotr Caban : msvcp: Remove superfluous semicolons.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: a1797d885f545c7d8a20e54f4e6f33dbf36f0c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1797d885f545c7d8a20e54f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 28 12:01:33 2012 +0000 msvcp: Remove superfluous semicolons. --- dlls/msvcp100/cxx.h | 2 +- dlls/msvcp100/exception.c | 18 +++++++++--------- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp100/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp60/cxx.h | 2 +- dlls/msvcp60/exception.c | 18 +++++++++--------- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp71/cxx.h | 2 +- dlls/msvcp71/exception.c | 18 +++++++++--------- dlls/msvcp71/ios.c | 4 ++-- dlls/msvcp71/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/exception.c | 18 +++++++++--------- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/locale.c | 42 +++++++++++++++++++++--------------------- 16 files changed, 132 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1797d885f545c7d8a20e…

1 0

Putin Evgeny : wineps.drv: Add orientation field to postscript header.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 3303ba7f4cb5e55c5382157c44852bcfd677d7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3303ba7f4cb5e55c5382157c4… Author: Putin Evgeny <evcalipt(a)etersoft.ru> Date: Tue Nov 13 14:07:34 2012 +0400 wineps.drv: Add orientation field to postscript header. --- dlls/wineps.drv/ps.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 35a55f0..2f482d4 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -49,11 +49,12 @@ static const char *cups_duplexes[3] = cups_two_sided_short /* DMDUP_HORIZONTAL */ }; -static const char psheader[] = /* title llx lly urx ury */ +static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" "%%%%BoundingBox: %d %d %d %d\n" "%%%%Pages: (atend)\n" +"%%%%Orientation: %s\n" "%%%%EndComments\n"; static const char psbeginprolog[] = @@ -366,6 +367,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; + const char * dmOrientation; + struct ticket_info ticket_info = { page, duplex }; TRACE("%s\n", debugstr_w(title)); @@ -397,7 +400,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) ury = physDev->ImageableArea.top * 72.0 / physDev->logPixelsY; /* FIXME should do something better with BBox */ - sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); + dmOrientation = (physDev->Devmode->dmPublic.u1.s1.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait"); + sprintf(buf, psheader, escaped_title, llx, lly, urx, ury, dmOrientation); HeapFree(GetProcessHeap(), 0, escaped_title);

1 0

André Hentschel : ntdll: Exit when we can' t map the shared user data.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 579f4f9da069441c269651177567f024a4df5ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579f4f9da069441c269651177… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 19:35:08 2012 +0100 ntdll: Exit when we can't map the shared user data. --- dlls/ntdll/thread.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8f8fdcf..01a8026 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -200,6 +200,7 @@ HANDLE thread_init(void) SIZE_T size, info_size; HANDLE exe_file = 0; LARGE_INTEGER now; + NTSTATUS status; struct ntdll_thread_data *thread_data; static struct debug_info debug_info; /* debug info for initial thread */ @@ -209,7 +210,13 @@ HANDLE thread_init(void) addr = (void *)0x7ffe0000; size = 0x10000; - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + MESSAGE( "wine: failed to map the shared user data: %08x\n", status ); + exit(1); + } user_shared_data = addr; /* allocate and initialize the PEB */

1 0

Akihiro Sagawa : winmm: Fix handling of mmio file buffers.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c2cf4ddb932274486cc83a693b4a737f94f31b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf4ddb932274486cc83a693… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 29 00:00:19 2012 +0900 winmm: Fix handling of mmio file buffers. --- dlls/winmm/mmio.c | 32 ++++++++++++++------------------ dlls/winmm/tests/mmio.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b6f60d1..551ccbf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -771,6 +771,8 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) return send_message(wm->ioProc, &wm->info, MMIOM_READ, (LPARAM)pch, cch, FALSE); /* first try from current buffer */ + if (cch && wm->info.fccIOProc != FOURCC_MEM && wm->info.pchNext == wm->info.pchEndRead) + MMIO_GrabNextBuffer(wm, TRUE); if (wm->info.pchNext != wm->info.pchEndRead) { count = wm->info.pchEndRead - wm->info.pchNext; if (count > cch || count < 0) count = cch; @@ -796,6 +798,8 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) cch -= size; count += size; } + wm->bBufferLoaded = FALSE; + mmioSeek(hmmio, 0, SEEK_CUR); } TRACE("count=%d\n", count); @@ -887,35 +891,27 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return -1; } - if (offset && offset >= wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) { - /* should check that write mode exists */ - if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) - return -1; - wm->info.lBufOffset = offset; - wm->info.pchEndRead = wm->info.pchBuffer; - wm->info.pchEndWrite = wm->info.pchBuffer + wm->info.cchBuffer; - if ((wm->info.dwFlags & MMIO_RWMODE) == MMIO_READ) { - wm->info.lDiskOffset = wm->dwFileSize; - } - } else if ((wm->info.cchBuffer > 0) && + /* stay in same buffer ? */ + /* some memory mapped buffers are defined with -1 as a size */ + if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || (offset >= wm->info.lBufOffset + wm->info.cchBuffer) || + (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || !wm->bBufferLoaded)) { - /* stay in same buffer ? */ - /* some memory mapped buffers are defined with -1 as a size */ /* condition to change buffer */ if ((wm->info.fccIOProc == FOURCC_MEM) || MMIO_Flush(wm, 0) != MMSYSERR_NOERROR || /* this also sets the wm->info.lDiskOffset field */ send_message(wm->ioProc, &wm->info, MMIOM_SEEK, - (offset / wm->info.cchBuffer) * wm->info.cchBuffer, - SEEK_SET, FALSE) == -1) + offset, SEEK_SET, FALSE) == -1) return -1; - MMIO_GrabNextBuffer(wm, TRUE); + wm->info.lBufOffset = offset; + wm->bBufferLoaded = FALSE; + wm->info.pchNext = wm->info.pchEndRead = wm->info.pchBuffer; } - - wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); + else + wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); TRACE("=> %d\n", offset); return offset; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 232f84b..d4697db 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -812,14 +812,14 @@ static void test_mmio_end_of_file(void) ok(sizeof(RIFF_buf) == ret, "got %d\n", ret); ret = mmioRead(hmmio, data, sizeof(data)); - todo_wine ok(ret == 0, "expected %d, got %d\n", 0, ret); + ok(ret == 0, "expected %d, got %d\n", 0, ret); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); res = mmioAdvance(hmmio, &mmio, MMIO_READ); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.pchNext == mmio.pchEndRead, "expected %p, got %p\n", mmio.pchEndRead, mmio.pchNext); + ok(mmio.pchNext == mmio.pchEndRead, "expected %p, got %p\n", mmio.pchEndRead, mmio.pchNext); mmioClose(hmmio, 0); DeleteFileA(test_file); @@ -874,18 +874,18 @@ static void test_mmio_buffer_pointer(void) ok(pos == size, "failed to seek, got %d\n", pos); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); - todo_wine ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); - todo_wine ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); /* reading a lot (as sizeof(data) > mmio.cchBuffer), the buffer is empty */ size = mmioRead(hmmio, data, sizeof(data)); ok(size == sizeof(data), "failed to read, got %d\n", size); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.lBufOffset == pos+size, "expected %d, got %d\n", pos+size, mmio.lBufOffset); - todo_wine ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); - todo_wine ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.lBufOffset == pos+size, "expected %d, got %d\n", pos+size, mmio.lBufOffset); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); mmioClose(hmmio, 0); DeleteFileA(test_file);

1 0

Jacek Caban : mshtml: Added IHTMLInputElement:: defaultValue property implementation.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 639a42a8fd304fc639018d91671688aa736bde73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639a42a8fd304fc639018d916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 28 16:57:24 2012 +0100 mshtml: Added IHTMLInputElement::defaultValue property implementation. --- dlls/mshtml/htmlinput.c | 26 ++++++++++++++++++--- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4d25c41..fb0e80b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -355,15 +355,33 @@ static HRESULT WINAPI HTMLInputElement_get_onselect(IHTMLInputElement *iface, VA static HRESULT WINAPI HTMLInputElement_put_defaultValue(IHTMLInputElement *iface, BSTR v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLInputElement_SetDefaultValue(This->nsinput, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetValue failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_defaultValue(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLInputElement_GetDefaultValue(This->nsinput, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLInputElement_put_readOnly(IHTMLInputElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6bd7837..d45a1fe 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2946,6 +2946,49 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) _test_input_value(line, unk, val); } +#define test_input_defaultValue(o,t) _test_input_defaultValue(__LINE__,o,t) +static void _test_input_defaultValue(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLInputElement *input; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLInputElement_get_defaultValue(input, &str); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line) (!strcmp_wa(str, exval), "defaultValue=%s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line) (!str, "exval != NULL\n"); + SysFreeString(str); + IHTMLInputElement_Release(input); +} + +#define test_input_put_defaultValue(o,v) _test_input_put_defaultValue(__LINE__,o,v) +static void _test_input_put_defaultValue(unsigned line, IUnknown *unk, const char *val) +{ + IHTMLInputElement *input; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + str = a2bstr(val); + hres = IHTMLInputElement_put_defaultValue(input, str); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + SysFreeString(str); + IHTMLInputElement_Release(input); + + _test_input_defaultValue(line, unk, val); +} + #define test_input_src(i,s) _test_input_src(__LINE__,i,s) static void _test_input_src(unsigned line, IHTMLInputElement *input, const char *exsrc) { @@ -5882,7 +5925,9 @@ static void test_elems(IHTMLDocument2 *doc) test_node_put_value_str((IUnknown*)elem, "test"); test_node_get_value_str((IUnknown*)elem, NULL); test_input_value((IUnknown*)elem, NULL); + test_input_defaultValue((IUnknown*)elem, NULL); test_input_put_value((IUnknown*)elem, "test"); + test_input_defaultValue((IUnknown*)elem, NULL); test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); test_elem_set_tabindex((IUnknown*)elem, 3); @@ -6307,6 +6352,17 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, + "<input value=\"val\" id =\"inputid\" />"); + elem = get_elem_by_id(doc, "inputid", TRUE); + if(elem) { + test_input_defaultValue((IUnknown*)elem, "val"); + test_input_put_value((IUnknown*)elem, "test"); + test_input_put_defaultValue((IUnknown*)elem, "new val"); + test_input_value((IUnknown*)elem, "test"); + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE); if(elem) {

1 0

Erich Hoover : advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 5851032d07c321f2c050187115cfd8e21b5f3f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5851032d07c321f2c05018711… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Nov 26 12:08:57 2012 -0700 advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo. --- dlls/advapi32/security.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/advapi32/tests/security.c | 15 +++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6afcc42..6c1cdf1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3919,9 +3919,41 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, PSID psidGroup, PACL pDacl, PACL pSacl) { - FIXME("%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + IO_STATUS_BLOCK io; + DWORD access = 0; + HANDLE hFile; + DWORD status; + + TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); - return ERROR_SUCCESS; + + if (!pObjectName) return ERROR_INVALID_PARAMETER; + if (!RtlDosPathNameToNtPathName_U( pObjectName, &nameW, NULL, NULL )) + return ERROR_PATH_NOT_FOUND; + + if (SecurityInfo & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION)) + access |= WRITE_OWNER; + if (SecurityInfo & DACL_SECURITY_INFORMATION) + access |= WRITE_DAC; + if (SecurityInfo & SACL_SECURITY_INFORMATION) + access |= ACCESS_SYSTEM_SECURITY; + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nameW; + attr.SecurityDescriptor = NULL; + + status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); + RtlFreeUnicodeString( &nameW ); + if (status != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + status = SetSecurityInfo( hFile, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseHandle( hFile ); + return status; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index da5af04..2a4df4d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -101,6 +101,8 @@ static BOOL (WINAPI *pSetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetNamedSecurityInfoA)(LPTSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); static BOOL (WINAPI *pIsValidSid)(PSID); @@ -170,6 +172,7 @@ static void init(void) pSetFileSecurityA = (void *)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (void *)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pSetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "SetNamedSecurityInfoA"); pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); @@ -3002,6 +3005,7 @@ static void test_SetEntriesInAclA(void) static void test_GetNamedSecurityInfoA(void) { + char invalid_path[] = "/an invalid file path"; PSECURITY_DESCRIPTOR pSecDesc; DWORD revision; SECURITY_DESCRIPTOR_CONTROL control; @@ -3014,9 +3018,9 @@ static void test_GetNamedSecurityInfoA(void) BOOL ret, isNT4; CHAR windows_dir[MAX_PATH]; - if (!pGetNamedSecurityInfoA) + if (!pGetNamedSecurityInfoA || !pSetNamedSecurityInfoA) { - win_skip("GetNamedSecurityInfoA is not available\n"); + win_skip("[Get|Set]NamedSecurityInfoA is not available\n"); return; } @@ -3072,6 +3076,13 @@ static void test_GetNamedSecurityInfoA(void) error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, NULL, NULL, &dacl, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + + /* Test behavior of SetNamedSecurityInfo with an invalid path */ + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(invalid_path, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL); + ok(error == ERROR_FILE_NOT_FOUND, "Unexpected error returned: 0x%x\n", error); + ok(GetLastError() == 0xdeadbeef, "Expected last error to remain unchanged.\n"); } static void test_ConvertStringSecurityDescriptor(void)

1 0

Erich Hoover : advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 722c2b1008416ff72be4e1d60060e79957061584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722c2b1008416ff72be4e1d60… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Nov 26 12:13:47 2012 -0700 advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo. --- dlls/advapi32/security.c | 104 ++++++++------------------------ dlls/advapi32/tests/security.c | 131 +++++++++++++++++++++++++++++++++------- 2 files changed, 133 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=722c2b1008416ff72be4e…

1 0