October 2009 - Wine-commits

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0a6c2c86be8ac0fa5e5293508cc6ae706455f3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6c2c86be8ac0fa5e5293508… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:10:40 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT). --- dlls/comctl32/tests/monthcal.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index cb229e4..64a11b0 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -859,11 +859,17 @@ static void test_monthcal_unicode(void) /* current setting is 1, so, should return 1 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0); - todo_wine {expect(1, res);} + todo_wine + ok(1 == res || + broken(0 == res), /* comctl32 <= 4.70 */ + "Expected 1, got %d\n", res); /* setting to 0, should return previous settings */ res = SendMessage(hwnd, MCM_SETUNICODEFORMAT, 0, 0); - todo_wine {expect(1, res);} + todo_wine + ok(1 == res || + broken(0 == res), /* comctl32 <= 4.70 */ + "Expected 1, got %d\n", res); /* current setting is 0, so, it should return 0 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0);

1 0

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETCURSEL and MCM_GETCURSEL).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: efaa25fe66bddc48a72d54cd1a6f46dbd1a84e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa25fe66bddc48a72d54cd1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:00:56 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETCURSEL and MCM_GETCURSEL). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index eaabc47..cb229e4 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -773,9 +773,15 @@ static void test_monthcal_currdate(void) expect(st_original.wYear, st_new.wYear); expect(st_original.wMonth, st_new.wMonth); expect(st_original.wDay, st_new.wDay); - expect(st_original.wHour, st_new.wHour); - expect(st_original.wMinute, st_new.wMinute); - expect(st_original.wSecond, st_new.wSecond); + ok(st_original.wHour == st_new.wHour || + broken(0 == st_new.wHour), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wHour, st_new.wHour); + ok(st_original.wMinute == st_new.wMinute || + broken(0 == st_new.wMinute), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wMinute, st_new.wMinute); + ok(st_original.wSecond == st_new.wSecond || + broken(0 == st_new.wSecond), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wSecond, st_new.wSecond); /* lparam cannot be NULL */ res = SendMessage(hwnd, MCM_GETCURSEL, 0, 0);

1 0

Paul Vriens : comctl32/tests: Fix some test failures (MCM_GETSELRANGE).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a7633d783dfeb375941d9b4e072ced1d48c9524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7633d783dfeb375941d9b4e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:21:59 2009 +0200 comctl32/tests: Fix some test failures (MCM_GETSELRANGE). --- dlls/comctl32/tests/monthcal.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 64a11b0..1ac2bb8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1484,7 +1484,7 @@ static void test_monthcal_getselrange(void) { HWND hwnd; SYSTEMTIME st, range[2]; - BOOL ret; + BOOL ret, old_comctl32 = FALSE; hwnd = create_monthcal_control(MCS_MULTISELECT); @@ -1492,25 +1492,37 @@ static void test_monthcal_getselrange(void) ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); expect(TRUE, ret); + memset(range, 0xcc, sizeof(range)); ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); expect(TRUE, ret); expect(st.wYear, range[0].wYear); expect(st.wMonth, range[0].wMonth); expect(st.wDay, range[0].wDay); - expect(st.wDayOfWeek, range[0].wDayOfWeek); - expect(st.wHour, range[0].wHour); - expect(st.wMinute, range[0].wMinute); - expect(st.wSecond, range[0].wSecond); - expect(st.wMilliseconds, range[0].wMilliseconds); + if (range[0].wDayOfWeek == 0) + { + win_skip("comctl32 <= 4.70 doesn't set some values\n"); + old_comctl32 = TRUE; + } + else + { + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); + } expect(st.wYear, range[1].wYear); expect(st.wMonth, range[1].wMonth); expect(st.wDay, range[1].wDay); - expect(st.wDayOfWeek, range[1].wDayOfWeek); - expect(st.wHour, range[1].wHour); - expect(st.wMinute, range[1].wMinute); - expect(st.wSecond, range[1].wSecond); - expect(st.wMilliseconds, range[1].wMilliseconds); + if (!old_comctl32) + { + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + } DestroyWindow(hwnd); }

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientTop implementation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6d6f341c64b037e59cccebe028a057374e2e2b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6f341c64b037e59cccebe02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 21:58:38 2009 +0200 mshtml: Added IHTMLElement2::clientTop implementation. --- dlls/mshtml/htmlelem2.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 342030c..5b58fd4 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -590,8 +590,25 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSElement *nselem; + PRInt32 client_top = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSElement_GetClientTop(nselem, &client_top); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); + } + + *p = client_top; + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p)

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientLeft implementation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 74071b0505234c7dab9b1fd69bd4692dbaf20506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74071b0505234c7dab9b1fd69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 21:59:05 2009 +0200 mshtml: Added IHTMLElement2::clientLeft implementation. --- dlls/mshtml/htmlelem2.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 5b58fd4..b870a2a 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -614,8 +614,25 @@ static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSElement *nselem; + PRInt32 client_left = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSElement_GetClientLeft(nselem, &client_left); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); + } + + *p = client_left; + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event,

1 0

Jacek Caban : mshtml: Added IHTMLElement2::client[Top|Left] tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 908e715c8327cd4a160699683f8772c64f2e5edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=908e715c8327cd4a160699683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 22:00:00 2009 +0200 mshtml: Added IHTMLElement2::client[Top|Left] tests. --- dlls/mshtml/tests/dom.c | 72 ++++++++++++++++++++++++++++++----------------- 1 files changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dba424b..c13c0a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -809,32 +809,6 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) return ret; } -static void test_doc_elem(IHTMLDocument2 *doc) -{ - IHTMLDocument2 *doc_node, *owner_doc; - IHTMLElement *elem; - IHTMLDocument3 *doc3; - HRESULT hres; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); - - hres = IHTMLDocument3_get_documentElement(doc3, &elem); - IHTMLDocument3_Release(doc3); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); - - test_node_name((IUnknown*)elem, "HTML"); - test_elem_tag((IUnknown*)elem, "HTML"); - - doc_node = get_doc_node(doc); - owner_doc = get_owner_doc((IUnknown*)elem); - ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); - IHTMLDocument2_Release(doc_node); - IHTMLDocument2_Release(owner_doc); - - IHTMLElement_Release(elem); -} - static void test_get_set_attr(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -2008,6 +1982,24 @@ static void _test_elem_client_size(unsigned line, IUnknown *unk) IHTMLElement2_Release(elem); } +#define test_elem_client_rect(u) _test_elem_client_rect(__LINE__,u) +static void _test_elem_client_rect(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + LONG l; + HRESULT hres; + + hres = IHTMLElement2_get_clientLeft(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientLeft failed: %08x\n", hres); + ok_(__FILE__,line) (!l, "clientLeft = %d\n", l); + + hres = IHTMLElement2_get_clientTop(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientTop failed: %08x\n", hres); + ok_(__FILE__,line) (!l, "clientTop = %d\n", l); + + IHTMLElement2_Release(elem); +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -4203,6 +4195,34 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_doc_elem(IHTMLDocument2 *doc) +{ + IHTMLDocument2 *doc_node, *owner_doc; + IHTMLElement *elem; + IHTMLDocument3 *doc3; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_get_documentElement(doc3, &elem); + IHTMLDocument3_Release(doc3); + ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + + test_node_name((IUnknown*)elem, "HTML"); + test_elem_tag((IUnknown*)elem, "HTML"); + + doc_node = get_doc_node(doc); + owner_doc = get_owner_doc((IUnknown*)elem); + ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); + IHTMLDocument2_Release(doc_node); + IHTMLDocument2_Release(owner_doc); + + test_elem_client_rect((IUnknown*)elem); + + IHTMLElement_Release(elem); +} + static void test_default_body(IHTMLBodyElement *body) { LONG l;

1 0

Jacek Caban : mshtml.idl: Moved IElementSelector dispinterface declaration to macro and added it to all element types with data .
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b399acd8384c81d1ac6997907a4c3dbe8ef9376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b399acd8384c81d1ac6997907… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:15:51 2009 +0200 mshtml.idl: Moved IElementSelector dispinterface declaration to macro and added it to all element types with data. --- include/mshtml.idl | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index e2c36a4..cfe6516 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5378,6 +5378,13 @@ interface IHTMLElement4 : IDispatch [propget, id(DISPID_IHTMLELEMENT4_ONFOCUSOUT), displaybind, bindable] \ VARIANT onfocusout() +#define WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL \ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] \ + IHTMLElement *querySelector([in] BSTR v); \ + \ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] \ + IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v) + /***************************************************************************** * IHTMLUniqueName interface */ @@ -5662,7 +5669,8 @@ interface IHTMLDatabinding : IDispatch WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; \ WINE_HTMLDOMNODE_DISPINTERFACE_DECL; \ WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; \ - WINE_IHTMLELEMENT5_DISPINTERFACE_DECL + WINE_IHTMLELEMENT5_DISPINTERFACE_DECL; \ + WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL /***************************************************************************** * IHTMLGenericElement interface @@ -7252,12 +7260,6 @@ properties: methods: WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; - [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] - IHTMLElement *querySelector([in] BSTR v); - - [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] - IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] IDispatch *constructor();

1 0

Jacek Caban : mshtml.idl: Moved IHTMLDOMConstructor dispinterface declaration to macro and add it to all element types .
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 7e37df04ecd8354366e5fcf27f6eb6bc3292d9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e37df04ecd8354366e5fcf27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:16:07 2009 +0200 mshtml.idl: Moved IHTMLDOMConstructor dispinterface declaration to macro and add it to all element types. --- include/mshtml.idl | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index cfe6516..6b694e1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -112,6 +112,10 @@ interface IHTMLDOMConstructor : IDispatch HRESULT DefineSetter([in] BSTR propname, [in] VARIANT* pdispHandler); } +#define WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL \ + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] \ + IDispatch *constructor() + interface IHTMLDocument2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -5659,7 +5663,8 @@ interface IHTMLDatabinding : IDispatch WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; \ WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; \ WINE_HTMLDOMNODE_DISPINTERFACE_DECL; \ - WINE_IHTMLELEMENT5_DISPINTERFACE_DECL + WINE_IHTMLELEMENT5_DISPINTERFACE_DECL; \ + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL #define WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL \ WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \ @@ -5670,7 +5675,8 @@ interface IHTMLDatabinding : IDispatch WINE_HTMLDOMNODE_DISPINTERFACE_DECL; \ WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; \ WINE_IHTMLELEMENT5_DISPINTERFACE_DECL; \ - WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL + WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL; \ + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL /***************************************************************************** * IHTMLGenericElement interface @@ -5759,8 +5765,7 @@ methods: [propget, id(DISPID_IHTMLSTYLESHEETRULE_READONLY)] VARIANT_BOOL readOnly(); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [ @@ -5808,8 +5813,7 @@ methods: [id(DISPID_IHTMLSTYLESHEETRULESCOLLECTION_ITEM)] IHTMLStyleSheetRule* item([in] long index); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [ @@ -5852,8 +5856,7 @@ methods: [propget, id(DISPID_IHTMLSTYLESHEETPAGE_PSEUDOCLASS)] BSTR pseudoClass(); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [ noncreatable, @@ -5897,8 +5900,7 @@ methods: [id(DISPID_IHTMLSTYLESHEETPAGESCOLLECTION_ITEM)] IHTMLStyleSheetPage* item([in] long index); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [ @@ -7260,9 +7262,6 @@ properties: methods: WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch *constructor(); - [propput, id(DISPID_IHTMLANCHORELEMENT_HREF), displaybind, bindable] void href(BSTR v); @@ -8741,8 +8740,7 @@ methods: [propget, id(DISPID_IOMNAVIGATOR_USERPROFILE)] IHTMLOpsProfile *userProfile(); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch *constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [ @@ -8898,8 +8896,7 @@ methods: [id(DISPID_IHTMLLOCATION_TOSTRING)] BSTR toString(); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch *constructor(); + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } [

1 0

Vincent Povirk : ole32: We do need to implement Commit/ Revert for non-root storage.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 40433554d508b9c2c1231e4dc486516e077879e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40433554d508b9c2c1231e4dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:27:24 2009 -0500 ole32: We do need to implement Commit/Revert for non-root storage. --- dlls/ole32/storage32.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9082334..61752e4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3720,13 +3720,12 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) ** ** Storage32InternalImpl_Commit ** -** The non-root storages cannot be opened in transacted mode thus this function -** does nothing. */ static HRESULT WINAPI StorageInternalImpl_Commit( IStorage* iface, DWORD grfCommitFlags) /* [in] */ { + FIXME("(%p,%x): stub\n", iface, grfCommitFlags); return S_OK; } @@ -3734,12 +3733,11 @@ static HRESULT WINAPI StorageInternalImpl_Commit( ** ** Storage32InternalImpl_Revert ** -** The non-root storages cannot be opened in transacted mode thus this function -** does nothing. */ static HRESULT WINAPI StorageInternalImpl_Revert( IStorage* iface) { + FIXME("(%p): stub\n", iface); return S_OK; }

1 0

Vincent Povirk : ole32/tests: Test substorages of transacted storage objects.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d6e020fdb856e2cad682311d7fe6a210b33d1ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e020fdb856e2cad682311d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 14:23:19 2009 -0500 ole32/tests: Test substorages of transacted storage objects. --- dlls/ole32/tests/storage32.c | 78 +++++++++++++++++++++++++++++++++++------ 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 620e6cb..b1f4b14 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -894,11 +894,13 @@ static void test_streamenum(void) static void test_transact(void) { - IStorage *stg = NULL, *stg2 = NULL; + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'F','O','O',0 }; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; DeleteFileA(filenameA); @@ -907,19 +909,40 @@ static void test_transact(void) STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); - /* now create a stream, but don't commit it */ + /* commit a new stream and storage */ r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); r = IStream_Write(stm, "this is stream 1\n", 16, NULL); ok(r==S_OK, "IStream->Write failed\n"); - r = IStream_Release(stm); + IStream_Release(stm); + + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* Create two substorages but only commit one */ + r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_Commit(stg, 0); + ok(r==S_OK, "IStorage->Commit failed\n"); - r = IStorage_Commit(stg, 0); - ok(r==S_OK, "IStorage->Commit failed\n"); + r = IStorage_CreateStorage(stg2, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); - /* now create a stream, but don't commit it */ + if (r == S_OK) + IStorage_Release(stg3); + + IStorage_Release(stg2); + } + + /* now create a stream and storage, but don't commit them */ stm = NULL; r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); @@ -927,10 +950,17 @@ static void test_transact(void) r = IStream_Write(stm, "this is stream 2\n", 16, NULL); ok(r==S_OK, "IStream->Write failed\n"); + /* IStream::Commit does nothing for OLE storage streams */ r = IStream_Commit(stm, STGC_ONLYIFCURRENT | STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); ok(r==S_OK, "IStream->Commit failed\n"); - r = IStream_Release(stm); + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stg2); + + IStream_Release(stm); IStorage_Release(stg); @@ -958,16 +988,40 @@ static void test_transact(void) r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); } - if (stm) - r = IStream_Release(stm); + if (r == S_OK) + IStream_Release(stm); + + todo_wine { + r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + } + if (r == S_OK) + IStorage_Release(stg2); r = IStorage_OpenStorage(stg, stmname2, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - ok(r==S_OK, "IStorage->OpenStream should fail %08x\n", r); - if (stm) - r = IStream_Release(stm); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==S_OK, "IStorage->OpenStorage should succeed %08x\n", r); + if (r == S_OK) + { + r = IStorage_OpenStorage(stg2, stgname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); + ok(r==S_OK, "IStorage->OpenStorage should succeed %08x\n", r); + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_OpenStorage(stg2, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + if (r == S_OK) + IStorage_Release(stg3); + + IStorage_Release(stg2); + } IStorage_Release(stg);

1 0