October 2009 - Wine-commits

Vincent Povirk : ole32/tests: Add test for IStorage::Revert.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 3c9067de9fcd92fbc1f7ff266259e90298dcd8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9067de9fcd92fbc1f7ff266… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:05:10 2009 -0500 ole32/tests: Add test for IStorage::Revert. --- dlls/ole32/tests/storage32.c | 157 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b1f4b14..cbb23c8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1029,6 +1029,162 @@ static void test_transact(void) ok( r == TRUE, "deleted file\n"); } +static void test_revert(void) +{ + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; + HRESULT r; + IStream *stm = NULL, *stm2 = 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 }; + STATSTG statstg; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* 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 = 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_CreateStorage(stg2, stgname2, 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); + } + + /* now create a stream and storage, then revert */ + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Write(stm2, "this is stream 2\n", 16, NULL); + ok(r==S_OK, "IStream->Write failed\n"); + + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + r = IStorage_Revert(stg); + + /* all open objects become invalid */ + todo_wine { + r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + r = IStream_Write(stm2, "this shouldn't work\n", 20, NULL); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + r = IStorage_Stat(stg2, &statstg, STATFLAG_NONAME); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + + r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + } + + IStream_Release(stm); + IStream_Release(stm2); + IStorage_Release(stg2); + IStorage_Release(stg3); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); + ok(r==STG_E_INVALIDFLAG, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); + + todo_wine { + 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 (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 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); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); + + /* Revert only invalidates objects in transacted mode */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStorage_Revert(stg); + todo_wine ok(r==S_OK, "IStorage->Revert failed %08x\n", r); + + r = IStream_Write(stm, "this works\n", 11, NULL); + ok(r==S_OK, "IStream_Write should succeed %08x\n", r); + + IStream_Release(stm); + IStream_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_ReadClassStm(void) { CLSID clsid; @@ -1584,6 +1740,7 @@ START_TEST(storage32) test_storage_refcount(); test_streamenum(); test_transact(); + test_revert(); test_ReadClassStm(); test_access(); test_writeclassstg();

1 0

Vincent Povirk : ole32/tests: Add test for non-root transacted storage objects.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 536aa9be99b7c724a887dea85333bff52f627afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=536aa9be99b7c724a887dea85… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:22:51 2009 -0500 ole32/tests: Add test for non-root transacted storage objects. --- dlls/ole32/tests/storage32.c | 102 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index cbb23c8..22c044d 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1185,6 +1185,107 @@ static void test_revert(void) ok( r == TRUE, "deleted file\n"); } +static void test_nonroot_transacted(void) +{ + IStorage *stg = NULL, *stg2 = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'F','O','O',0 }; + + DeleteFileA(filenameA); + + /* create a transacted file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a transacted substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* create and commit stmname */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Commit(stg2, 0); + + /* create and revert stmname2 */ + r = IStorage_CreateStream(stg2, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Revert(stg2); + + /* check that Commit and Revert really worked */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStream_Release(stg); + + /* create a non-transacted file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a transacted substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* create and commit stmname */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Commit(stg2, 0); + + /* create and revert stmname2 */ + r = IStorage_CreateStream(stg2, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Revert(stg2); + + /* check that Commit and Revert really worked */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStream_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_ReadClassStm(void) { CLSID clsid; @@ -1741,6 +1842,7 @@ START_TEST(storage32) test_streamenum(); test_transact(); test_revert(); + test_nonroot_transacted(); test_ReadClassStm(); test_access(); test_writeclassstg();

1 0

Jacek Caban : mshtml.idl: Moved IHTMLDOMNode dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 042fa2e42c3fc90de793b908b6a8e64dd04a4e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=042fa2e42c3fc90de793b908b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:14:13 2009 +0200 mshtml.idl: Moved IHTMLDOMNode dispinterface declaration to macro. --- include/mshtml.idl | 973 +++++----------------------------------------------- 1 files changed, 79 insertions(+), 894 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=042fa2e42c3fc90de793b…

1 0

Jacek Caban : mshtml.idl: Moved IHTMLDOMNode2 dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 25c6a6c5c0f2740d50d477cf9e058fbf9c5afadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c6a6c5c0f2740d50d477cf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:14:34 2009 +0200 mshtml.idl: Moved IHTMLDOMNode2 dispinterface declaration to macro. --- include/mshtml.idl | 60 +++++++++++++++------------------------------------ 1 files changed, 18 insertions(+), 42 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 35dbe13..0c5771f 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3481,6 +3481,10 @@ interface IHTMLDOMNode2 : IDispatch HRESULT ownerDocument([retval, out] IDispatch **p); } +#define WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL \ + [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] \ + IDispatch *ownerDocument() + /***************************************************************************** * IHTMLDOMAttribute interface */ @@ -3724,9 +3728,7 @@ methods: [in] BSTR bstrstring); WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; } /***************************************************************************** @@ -5436,9 +5438,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLGENERICELEMENT_RECORDSET), hidden] IDispatch *recordset(); @@ -6346,9 +6346,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -6764,9 +6762,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch* ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLBODYELEMENT_BACKGROUND), displaybind, bindable] void background(BSTR v); @@ -7059,9 +7055,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch* ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -7609,9 +7603,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -7829,9 +7821,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -8217,9 +8207,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -8545,9 +8533,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; } /***************************************************************************** @@ -12428,9 +12414,7 @@ methods: BSTR compatMode(); WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; } /***************************************************************************** @@ -12539,9 +12523,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLCOMMENTELEMENT_TEXT), displaybind, bindable] void text(BSTR v); @@ -13766,9 +13748,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v); @@ -13964,9 +13944,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLTABLEROW_ALIGN)] void align(BSTR v); @@ -14232,9 +14210,7 @@ methods: WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] - IDispatch *ownerDocument(); + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] void dataFld(BSTR v);

1 0

Jacek Caban : mshtml.idl: Moved IHTMLDatabinding dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: bb0999b280c1bef76378ff3c36e401654a586b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0999b280c1bef76378ff3c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:14:50 2009 +0200 mshtml.idl: Moved IHTMLDatabinding dispinterface declaration to macro. --- include/mshtml.idl | 206 +++++++++++++-------------------------------------- 1 files changed, 53 insertions(+), 153 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 0c5771f..76ab0e8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5400,6 +5400,52 @@ interface IHTMLUniqueName : IDispatch [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] \ BSTR uniqueID() +[ + odl, + oleautomation, + dual, + uuid(3050f3f2-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDatabinding : IDispatch +{ + [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] + HRESULT dataFld([in] BSTR v); + + [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] + HRESULT dataFld([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] + HRESULT dataSrc([in] BSTR v); + + [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] + HRESULT dataSrc([retval, out] BSTR * p); + + [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] + HRESULT dataFormatAs([in] BSTR v); + + [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] + HRESULT dataFormatAs([retval, out] BSTR * p); +} + +#define WINE_IHTMLDATABINDING_DISPINTERFACE_DECL \ + [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] \ + void dataFld(BSTR v); \ + \ + [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] \ + BSTR dataFld(); \ + \ + [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] \ + void dataSrc(BSTR v); \ + \ + [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] \ + BSTR dataSrc(); \ + \ + [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] \ + void dataFormatAs(BSTR v); \ + \ + [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] \ + BSTR dataFormatAs() + /***************************************************************************** * IHTMLGenericElement interface */ @@ -6347,24 +6393,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLIMGELEMENT_ISMAP), displaybind, bindable] void isMap(VARIANT_BOOL v); @@ -6514,33 +6543,6 @@ methods: BSTR longDesc(); } -[ - odl, - oleautomation, - dual, - uuid(3050f3f2-98b5-11cf-bb82-00aa00bdce0b) -] -interface IHTMLDatabinding : IDispatch -{ - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - HRESULT dataFld([in] BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - HRESULT dataFld([retval, out] BSTR * p); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - HRESULT dataSrc([in] BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - HRESULT dataSrc([retval, out] BSTR * p); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - HRESULT dataFormatAs([in] BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - HRESULT dataFormatAs([retval, out] BSTR * p); -}; - /***************************************************************************** * IHTMLControlElement interface */ @@ -7056,24 +7058,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [id(DISPID_IHTMLELEMENT5_IE8_GETATTRIBUTENODE)] IHTMLDOMAttribute2 *ie8_getAttributeNode([in] BSTR bstrname); @@ -7604,24 +7589,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] void size(LONG v); @@ -7822,24 +7790,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLOPTIONELEMENT_SELECTED)] void selected(VARIANT_BOOL v); @@ -8208,24 +8159,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLINPUTELEMENT_TYPE)] void type(BSTR v); @@ -13749,24 +13683,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLTABLE_COLS)] void cols(LONG v); @@ -14211,24 +14128,7 @@ methods: WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - - [propput, id(DISPID_IHTMLDATABINDING_DATAFLD)] - void dataFld(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFLD)] - BSTR dataFld(); - - [propput, id(DISPID_IHTMLDATABINDING_DATASRC)] - void dataSrc(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATASRC)] - BSTR dataSrc(); - - [propput, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - void dataFormatAs(BSTR v); - - [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] - BSTR dataFormatAs(); + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLFRAMEBASE_SRC)] void src(BSTR v);

1 0

Jacek Caban : mshtml.idl: Group common sets of disinterfaces in macros.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b5d095bd6a9753a9ce04756b8c3663bbc7455842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d095bd6a9753a9ce04756b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:15:13 2009 +0200 mshtml.idl: Group common sets of disinterfaces in macros. --- include/mshtml.idl | 130 ++++++++++++++-------------------------------------- 1 files changed, 35 insertions(+), 95 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 76ab0e8..85bfa98 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3485,6 +3485,10 @@ interface IHTMLDOMNode2 : IDispatch [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] \ IDispatch *ownerDocument() +#define WINE_HTMLDOMNODE_DISPINTERFACE_DECL \ + WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; \ + WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL + /***************************************************************************** * IHTMLDOMAttribute interface */ @@ -3727,8 +3731,7 @@ methods: [in] LONG Count, [in] BSTR bstrstring); - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLDOMNODE_DISPINTERFACE_DECL; } /***************************************************************************** @@ -5446,6 +5449,23 @@ interface IHTMLDatabinding : IDispatch [propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] \ BSTR dataFormatAs() +#define WINE_HTMLELEMENT_DISPINTERFACE_DECL \ + WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; \ + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; \ + WINE_HTMLDOMNODE_DISPINTERFACE_DECL + +#define WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL \ + WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; \ + WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; \ + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; \ + WINE_HTMLDOMNODE_DISPINTERFACE_DECL; \ + WINE_IHTMLDATABINDING_DISPINTERFACE_DECL + /***************************************************************************** * IHTMLGenericElement interface */ @@ -5478,13 +5498,7 @@ dispinterface DispHTMLGenericElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLGENERICELEMENT_RECORDSET), hidden] IDispatch *recordset(); @@ -6386,14 +6400,7 @@ dispinterface DispHTMLImg { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLIMGELEMENT_ISMAP), displaybind, bindable] void isMap(VARIANT_BOOL v); @@ -6758,13 +6765,7 @@ dispinterface DispHTMLBody { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLBODYELEMENT_BACKGROUND), displaybind, bindable] void background(BSTR v); @@ -7051,14 +7052,7 @@ dispinterface DispHTMLAnchorElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [id(DISPID_IHTMLELEMENT5_IE8_GETATTRIBUTENODE)] IHTMLDOMAttribute2 *ie8_getAttributeNode([in] BSTR bstrname); @@ -7582,14 +7576,7 @@ dispinterface DispHTMLSelectElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] void size(LONG v); @@ -7783,14 +7770,7 @@ dispinterface DispHTMLOptionElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLOPTIONELEMENT_SELECTED)] void selected(VARIANT_BOOL v); @@ -8152,14 +8132,7 @@ dispinterface DispHTMLInputElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLINPUTELEMENT_TYPE)] void type(BSTR v); @@ -8461,13 +8434,7 @@ dispinterface DispHTMLUnknownElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLELEMENT_DISPINTERFACE_DECL; } /***************************************************************************** @@ -12347,8 +12314,7 @@ methods: [propget, id(DISPID_IHTMLDOCUMENT5_COMPATMODE)] BSTR compatMode(); - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLDOMNODE_DISPINTERFACE_DECL; } /***************************************************************************** @@ -12451,13 +12417,7 @@ dispinterface DispHTMLCommentElement { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLCOMMENTELEMENT_TEXT), displaybind, bindable] void text(BSTR v); @@ -13676,14 +13636,7 @@ dispinterface DispHTMLTable { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLTABLE_COLS)] void cols(LONG v); @@ -13855,13 +13808,7 @@ dispinterface DispHTMLTableRow { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; + WINE_HTMLELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLTABLEROW_ALIGN)] void align(BSTR v); @@ -14121,14 +14068,7 @@ dispinterface DispHTMLIFrame { properties: methods: - WINE_IHTMLELEMENT_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; - WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE_DISPINTERFACE_DECL; - WINE_IHTMLDOMNODE2_DISPINTERFACE_DECL; - WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; [propput, id(DISPID_IHTMLFRAMEBASE_SRC)] void src(BSTR v);

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement5 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: e0f798b6e8be1742553e0dd596a9bdc519dafe47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f798b6e8be1742553e0dd59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:15:33 2009 +0200 mshtml.idl: Moved IHTMLElement5 dispinterface declaration to macro and add it to all element types. --- include/mshtml.idl | 397 ++++++++++++++++++++++++++-------------------------- 1 files changed, 200 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0f798b6e8be1742553e0…

1 0

Juan Lang : winhttp: Unload OpenSSL when unloading winhttp.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d7d8a0eec46219adc421065223959737a91f92ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d8a0eec46219adc42106522… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 07:53:01 2009 -0700 winhttp: Unload OpenSSL when unloading winhttp. --- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 16 ++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index c0ac9cb..945123a 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -42,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + netconn_unload(); break; } return TRUE; diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a824271..7ab9944 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -97,6 +97,7 @@ static SSL_CTX *ctx; MAKE_FUNCPTR( SSL_library_init ); MAKE_FUNCPTR( SSL_load_error_strings ); MAKE_FUNCPTR( SSLv23_method ); +MAKE_FUNCPTR( SSL_CTX_free ); MAKE_FUNCPTR( SSL_CTX_new ); MAKE_FUNCPTR( SSL_new ); MAKE_FUNCPTR( SSL_free ); @@ -221,6 +222,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_library_init ); LOAD_FUNCPTR( SSL_load_error_strings ); LOAD_FUNCPTR( SSLv23_method ); + LOAD_FUNCPTR( SSL_CTX_free ); LOAD_FUNCPTR( SSL_CTX_new ); LOAD_FUNCPTR( SSL_new ); LOAD_FUNCPTR( SSL_free ); @@ -270,6 +272,20 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) return TRUE; } +void netconn_unload( void ) +{ +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) + if (libcrypto_handle) + wine_dlclose( libcrypto_handle, NULL, 0 ); + if (libssl_handle) + { + if (ctx) + pSSL_CTX_free( ctx ); + wine_dlclose( libssl_handle, NULL, 0 ); + } +#endif +} + BOOL netconn_connected( netconn_t *conn ) { return (conn->socket != -1); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index e445109..64348a2 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -215,6 +215,7 @@ BOOL netconn_connected( netconn_t * ); BOOL netconn_create( netconn_t *, int, int, int ); BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); BOOL netconn_init( netconn_t *, BOOL ); +void netconn_unload( void ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * );

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement2 dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: bff6c1cd72dfb72700fa08e252ffb31fbc361a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff6c1cd72dfb72700fa08e25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:12:10 2009 +0200 mshtml.idl: Moved IHTMLElement2 dispinterface declaration to macro. --- include/mshtml.idl | 3680 +++++----------------------------------------------- 1 files changed, 310 insertions(+), 3370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bff6c1cd72dfb72700fa0…

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 48395ae09c7409bd746eb14cbab2c8f999c21a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48395ae09c7409bd746eb14cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:13:09 2009 +0200 mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro. --- include/mshtml.idl | 2048 ++++------------------------------------------------ 1 files changed, 150 insertions(+), 1898 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48395ae09c7409bd746eb…

1 0