October 2009 - Wine-Commits

Jacek Caban : mshtml.idl: Moved IHTMLDOMConstructor dispinterface declaration to macro and add it to all element types .
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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/tests: Test substorages of transacted storage objects.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Jacek Caban : mshtml.idl: Moved IHTMLElement5 dispinterface declaration to macro and add it to all element types .
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Jacek Caban : mshtml.idl: Moved IHTMLDOMNode dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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: Group common sets of disinterfaces in macros.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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 IHTMLDatabinding dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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: Moved IHTMLDOMNode2 dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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 IHTMLUniqueName dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: c8230cfa5196b32903fe8841893152fc8327ec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8230cfa5196b32903fe88418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:13:57 2009 +0200 mshtml.idl: Moved IHTMLUniqueName dispinterface declaration to macro. --- include/mshtml.idl | 129 +++++++++++++++------------------------------------ 1 files changed, 38 insertions(+), 91 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index c8b1068..f04cf77 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5371,6 +5371,31 @@ interface IHTMLElement4 : IDispatch VARIANT onfocusout() /***************************************************************************** + * IHTMLUniqueName interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4d0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLUniqueName : IDispatch +{ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] + HRESULT uniqueNumber([retval, out] LONG * p); + + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] + HRESULT uniqueID([retval, out] BSTR * p); +} + +#define WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL \ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] \ + LONG uniqueNumber(); \ + \ + [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] \ + BSTR uniqueID() + +/***************************************************************************** * IHTMLGenericElement interface */ [ @@ -5406,12 +5431,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -6384,12 +6404,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -6622,25 +6637,7 @@ methods: [propget, id(DISPID_IHTMLIMGELEMENT2_LONGDESC), displaybind, bindable] BSTR longDesc(); -}; - -/***************************************************************************** - * IHTMLUniqueName interface - */ -[ - odl, - oleautomation, - dual, - uuid(3050f4d0-98b5-11cf-bb82-00aa00bdce0b) -] -interface IHTMLUniqueName : IDispatch -{ - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - HRESULT uniqueNumber([retval, out] LONG * p); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - HRESULT uniqueID([retval, out] BSTR * p); -}; +} [ odl, @@ -6888,12 +6885,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -7251,12 +7243,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -7869,12 +7856,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -8157,12 +8139,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -8613,12 +8590,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -9009,12 +8981,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -13133,12 +13100,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -14428,12 +14390,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -14694,12 +14651,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType(); @@ -15030,12 +14982,7 @@ methods: WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; WINE_IHTMLELEMENT3_DISPINTERFACE_DECL; WINE_IHTMLELEMENT4_DISPINTERFACE_DECL; - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - LONG uniqueNumber(); - - [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] - BSTR uniqueID(); + WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] LONG nodeType();

1 0

Jacek Caban : mshtml.idl: Moved IHTMLElement3 dispinterface declaration to macro.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Juan Lang : winhttp: Protect OpenSSL initialization with critical section.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 349e82508029bdd600704d5e34146d7251ee4f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349e82508029bdd600704d5e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 30 10:55:36 2009 -0700 winhttp: Protect OpenSSL initialization with critical section. --- dlls/winhttp/net.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b264314..a824271 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -76,6 +76,16 @@ static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; #include <openssl/err.h> +static CRITICAL_SECTION init_ssl_cs; +static CRITICAL_SECTION_DEBUG init_ssl_cs_debug = +{ + 0, 0, &init_ssl_cs, + { &init_ssl_cs_debug.ProcessLocksList, + &init_ssl_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_ssl_cs") } +}; +static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; + static void *libssl_handle; static void *libcrypto_handle; @@ -180,17 +190,24 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) if (!secure) return TRUE; #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) - if (libssl_handle) return TRUE; + EnterCriticalSection( &init_ssl_cs ); + if (libssl_handle) + { + LeaveCriticalSection( &init_ssl_cs ); + return TRUE; + } if (!(libssl_handle = wine_dlopen( SONAME_LIBSSL, RTLD_NOW, NULL, 0 ))) { ERR("Trying to use SSL but couldn't load %s. Expect trouble.\n", SONAME_LIBSSL); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } if (!(libcrypto_handle = wine_dlopen( SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0 ))) { ERR("Trying to use SSL but couldn't load %s. Expect trouble.\n", SONAME_LIBCRYPTO); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } #define LOAD_FUNCPTR(x) \ @@ -198,6 +215,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { \ ERR("Failed to load symbol %s\n", #x); \ set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); \ + LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } LOAD_FUNCPTR( SSL_library_init ); @@ -221,6 +239,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { \ ERR("Failed to load symbol %s\n", #x); \ set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); \ + LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } LOAD_FUNCPTR( BIO_new_fp ); @@ -239,8 +258,10 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + LeaveCriticalSection( &init_ssl_cs ); #else WARN("SSL support not compiled in.\n"); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR );

1 0