November 2007 - Wine-commits

David Adam : d3dx8: Implement D3DXQuaternionRotationYawPitchRoll.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 16a8efa410859fcaadc80b931fb1949a086ece4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a8efa410859fcaadc80b931… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Nov 20 15:23:36 2007 +0100 d3dx8: Implement D3DXQuaternionRotationYawPitchRoll. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 6 ++++++ include/d3dx8math.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 4e7996a..d398791 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -52,7 +52,7 @@ @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stdcall D3DXQuaternionRotationMatrix(ptr ptr) @ stdcall D3DXQuaternionRotationAxis(ptr ptr long) -@ stub D3DXQuaternionRotationYawPitchRoll +@ stdcall D3DXQuaternionRotationYawPitchRoll(ptr long long long) @ stdcall D3DXQuaternionMultiply(ptr ptr ptr) @ stdcall D3DXQuaternionNormalize(ptr ptr) @ stdcall D3DXQuaternionInverse(ptr ptr) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index f1cbf22..aa8664f 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -706,6 +706,15 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST return pout; } +D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +{ + pout->x = sin( yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) + cos(yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); + pout->y = sin( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) - cos(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); + pout->z = cos(yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) - sin( yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); + pout->w = cos( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) + sin(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); + return pout; +} + D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) { FLOAT dot, epsilon; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 6a63fd8..950bc5e 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -701,6 +701,12 @@ static void D3X8QuaternionTest(void) D3DXQuaternionRotationMatrix(&gotquat,&mat); expect_vec4(expectedquat,gotquat); +/*_______________D3DXQuaternionRotationYawPitchRoll__________*/ + expectedquat.x = 0.303261f; expectedquat.y = 0.262299f; expectedquat.z = 0.410073f; expectedquat.w = 0.819190f; + D3DXQuaternionRotationYawPitchRoll(&gotquat,D3DX_PI/4.0f,D3DX_PI/11.0f,D3DX_PI/3.0f); + expect_vec4(expectedquat,gotquat); + + /*_______________D3DXQuaternionSlerp________________________*/ expectedquat.x = -0.2f; expectedquat.y = 2.6f; expectedquat.z = 1.3f; expectedquat.w = 9.1f; D3DXQuaternionSlerp(&gotquat,&q,&r,scale); diff --git a/include/d3dx8math.h b/include/d3dx8math.h index f9bc777..5ef85b4 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -308,6 +308,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQU D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq); D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle); D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm); +D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t); void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle);

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheetsCollection::item implementation .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: c5953bec63bdb31db155317466ffc380ca77c4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5953bec63bdb31db15531746… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:09:20 2007 +0100 mshtml: Added IHTMLStyleSheetsCollection::item implementation. --- dlls/mshtml/htmlstylesheet.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 823e5f5..30c25ce 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -170,8 +170,38 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection VARIANT *pvarIndex, VARIANT *pvarResult) { HTMLStyleSheetsCollection *This = HTMLSTYLESHEETSCOL_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + + switch(V_VT(pvarIndex)) { + case VT_I4: { + nsIDOMStyleSheet *nsstylesheet; + nsresult nsres; + + TRACE("index=%d\n", V_I4(pvarIndex)); + + nsres = nsIDOMStyleSheetList_Item(This->nslist, V_I4(pvarIndex), &nsstylesheet); + if(NS_FAILED(nsres) || !nsstylesheet) { + WARN("Item failed: %08x\n", nsres); + V_VT(pvarResult) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarResult) = VT_DISPATCH; + V_DISPATCH(pvarResult) = (IDispatch*)HTMLStyleSheet_Create(nsstylesheet); + + return S_OK; + } + + case VT_BSTR: + FIXME("id=%s not implemented\n", debugstr_w(V_BSTR(pvarResult))); + return E_NOTIMPL; + + default: + WARN("Invalid vt=%d\n", V_VT(pvarIndex)); + } + + return E_INVALIDARG; } #undef HTMLSTYLESHEETSCOL_THIS

1 0

Jacek Caban : mshtml: Added IOleCommandTarget implementation to HTMLTxtRange.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 0ea1bfc2ac141ece486f8376efe0c91cffb43d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea1bfc2ac141ece486f8376e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:16:04 2007 +0100 mshtml: Added IOleCommandTarget implementation to HTMLTxtRange. --- dlls/mshtml/txtrange.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 0ad3621..1d8d2cb 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -40,6 +40,7 @@ static const WCHAR brW[] = {'b','r',0}; typedef struct { const IHTMLTxtRangeVtbl *lpHTMLTxtRangeVtbl; + const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; LONG ref; @@ -942,6 +943,9 @@ static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID r }else if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) { TRACE("(%p)->(IID_IHTMLTxtRange %p)\n", This, ppv); *ppv = HTMLTXTRANGE(This); + }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { + TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); + *ppv = CMDTARGET(This); } if(*ppv) { @@ -1697,11 +1701,66 @@ static const IHTMLTxtRangeVtbl HTMLTxtRangeVtbl = { HTMLTxtRange_execCommandShowHelp }; +#define OLECMDTRG_THIS(iface) DEFINE_THIS(HTMLTxtRange, OleCommandTarget, iface) + +static HRESULT WINAPI RangeCommandTarget_QueryInterface(IOleCommandTarget *iface, REFIID riid, void **ppv) +{ + HTMLTxtRange *This = OLECMDTRG_THIS(iface); + return IHTMLTxtRange_QueryInterface(HTMLTXTRANGE(This), riid, ppv); +} + +static ULONG WINAPI RangeCommandTarget_AddRef(IOleCommandTarget *iface) +{ + HTMLTxtRange *This = OLECMDTRG_THIS(iface); + return IHTMLTxtRange_AddRef(HTMLTXTRANGE(This)); +} + +static ULONG WINAPI RangeCommandTarget_Release(IOleCommandTarget *iface) +{ + HTMLTxtRange *This = OLECMDTRG_THIS(iface); + return IHTMLTxtRange_Release(HTMLTXTRANGE(This)); +} + +static HRESULT WINAPI RangeCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + HTMLTxtRange *This = OLECMDTRG_THIS(iface); + FIXME("(%p)->(%s %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + return E_NOTIMPL; +} + +static HRESULT WINAPI RangeCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + HTMLTxtRange *This = OLECMDTRG_THIS(iface); + TRACE("(%p)->(%s %d %x %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, + nCmdexecopt, pvaIn, pvaOut); + + if(pguidCmdGroup && IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + FIXME("Unsupported cmdid %d of CGID_MSHTML\n", nCmdID); + }else { + FIXME("Unsupported cmd %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); + } + + return E_NOTIMPL; +} + +#undef OLECMDTRG_THIS + +static const IOleCommandTargetVtbl OleCommandTargetVtbl = { + RangeCommandTarget_QueryInterface, + RangeCommandTarget_AddRef, + RangeCommandTarget_Release, + RangeCommandTarget_QueryStatus, + RangeCommandTarget_Exec +}; + IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument *doc, nsIDOMRange *nsrange) { HTMLTxtRange *ret = mshtml_alloc(sizeof(HTMLTxtRange)); ret->lpHTMLTxtRangeVtbl = &HTMLTxtRangeVtbl; + ret->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; ret->ref = 1; if(nsrange)

1 0

Jacek Caban : kernel32: Terminate child process in virtual tests.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 8c2b994c4668395e8234dd218fbbc9ba3b7abcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2b994c4668395e8234dd218… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:09:50 2007 +0100 kernel32: Terminate child process in virtual tests. --- dlls/kernel32/tests/virtual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 712ddf3..54918cf 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -557,6 +557,9 @@ static void test_NtMapViewOfSection(void) CloseHandle( mapping ); CloseHandle( file ); DeleteFileA( testfile ); + + TerminateProcess(hProcess, 0); + CloseHandle(hProcess); } static void test_BadPtr(void)

1 0

Jacek Caban : shdocvw: Silence common invalid QueryInterface FIXMEs.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: aa30f442b1a2f986079cae8c6a825f19b85944fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa30f442b1a2f986079cae8c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:10:03 2007 +0100 shdocvw: Silence common invalid QueryInterface FIXMEs. --- dlls/shdocvw/tests/webbrowser.c | 10 ++++++++++ dlls/shdocvw/webbrowser.c | 6 ++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2659bc4..8e457fc 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1412,6 +1412,8 @@ static void test_QueryInterface(IUnknown *unk) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; + IPerPropertyBrowsing *propbrowse = (void*)0xdeadbeef; + IOleCache *cache = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -1421,6 +1423,14 @@ static void test_QueryInterface(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&runnable); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable); + + hres = IUnknown_QueryInterface(unk, &IID_IPerPropertyBrowsing, (void**)&propbrowse); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(runnable == NULL, "runnable=%p, ezpected NULL\n", runnable); + + hres = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&cache); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(cache == NULL, "runnable=%p, ezpected NULL\n", runnable); } static void test_WebBrowser(void) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 79ae4a1..59cc117 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -108,6 +108,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IPerPropertyBrowsing, riid)) { + TRACE("(%p)->(IID_IPerPropertyBrowsing %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IOleCache, riid)) { + TRACE("(%p)->(IID_IOleCache %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; } if(*ppv) {

1 0

James Hawkins : msi: Fix the condition of a FIXME.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 6dd927a265b98bd4dc2bf59324726bd950faf816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd927a265b98bd4dc2bf5932… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:07:52 2007 -0600 msi: Fix the condition of a FIXME. --- dlls/msi/source.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index e6e1de5..68f94b5 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -240,8 +240,8 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (szUserSid) FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); - if (dwContext == MSIINSTALLCONTEXT_USERUNMANAGED) - FIXME("Unknown context MSIINSTALLCONTEXT_USERUNMANAGED\n"); + if (dwContext != MSIINSTALLCONTEXT_USERUNMANAGED) + FIXME("Unhandled context %d\n", dwContext); rc = OpenSourceKey(szProduct, &sourcekey, dwOptions, dwContext, FALSE); if (rc != ERROR_SUCCESS)

1 0

James Hawkins : msi: Downgrade an ERR to a WARN.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 63fe32a8bb87c0f2b59478c589eaf276c2dfa7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fe32a8bb87c0f2b59478c58… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:09:01 2007 -0600 msi: Downgrade an ERR to a WARN. --- dlls/msi/where.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index ecca17a..26e4c8f 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -505,7 +505,7 @@ static UINT WHERE_VerifyCondition( MSIDATABASE *db, MSIVIEW *table, struct expr else { *valid = 0; - ERR("Couldn't find column %s\n", debugstr_w( cond->u.column ) ); + WARN("Couldn't find column %s\n", debugstr_w( cond->u.column ) ); } break; case EXPR_COMPLEX:

1 0

Jacek Caban : urlmon: Wrap heap functions.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 03218d6d2cd8f6fab46596e6a8714d3eb0dc10d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03218d6d2cd8f6fab46596e6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:07:54 2007 +0100 urlmon: Wrap heap functions. --- dlls/urlmon/bindctx.c | 8 +++--- dlls/urlmon/binding.c | 36 ++++++++++++++++---------------- dlls/urlmon/bindprot.c | 4 +- dlls/urlmon/file.c | 12 +++++----- dlls/urlmon/format.c | 8 +++--- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/http.c | 35 +++++++++++++++---------------- dlls/urlmon/mk.c | 12 +++++----- dlls/urlmon/regsvr.c | 4 +- dlls/urlmon/sec_mgr.c | 22 +++++++++--------- dlls/urlmon/session.c | 12 +++++----- dlls/urlmon/umon.c | 50 ++++++++++++++++++++++---------------------- dlls/urlmon/umstream.c | 34 +++++++++++++----------------- dlls/urlmon/urlmon_main.h | 20 ++++++++++++++++++ 14 files changed, 138 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03218d6d2cd8f6fab4659…

1 0

Jacek Caban : mshtml: Store nsIDOMCSSStyleSheet in HTMLStyleSheet object if available.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 4b302f9c89aa78557e1f3f656d152762ab2ae31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b302f9c89aa78557e1f3f656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 25 19:08:40 2007 +0100 mshtml: Store nsIDOMCSSStyleSheet in HTMLStyleSheet object if available. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlstylesheet.c | 14 +++++++++++++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsiface.idl | 33 ++++++++++++++++++++++++++++++++- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e9df70e..6ad153a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1046,7 +1046,7 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR FIXME("(%p)->(%s %ld %p) semi-stub\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet); - *ppnewStyleSheet = HTMLStyleSheet_Create(); + *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); return S_OK; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 30be079..823e5f5 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -38,7 +38,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { const IHTMLStyleSheetVtbl *lpHTMLStyleSheetVtbl; + LONG ref; + + nsIDOMCSSStyleSheet *nsstylesheet; } HTMLStyleSheet; typedef struct { @@ -470,12 +473,21 @@ static const IHTMLStyleSheetVtbl HTMLStyleSheetVtbl = { HTMLStyleSheet_get_rules }; -IHTMLStyleSheet *HTMLStyleSheet_Create(void) +IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet *nsstylesheet) { HTMLStyleSheet *ret = mshtml_alloc(sizeof(HTMLStyleSheet)); + nsresult nsres; ret->lpHTMLStyleSheetVtbl = &HTMLStyleSheetVtbl; ret->ref = 1; + ret->nsstylesheet = NULL; + + if(nsstylesheet) { + nsres = nsIDOMStyleSheet_QueryInterface(nsstylesheet, &IID_nsIDOMCSSStyleSheet, + (void**)&ret->nsstylesheet); + if(NS_FAILED(nsres)) + ERR("Could not get nsICSSStyleSheet interface: %08x\n", nsres); + } return HTMLSTYLESHEET(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2bf926b..03837ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -430,7 +430,7 @@ void set_current_mon(HTMLDocument*,IMoniker*); IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); -IHTMLStyleSheet *HTMLStyleSheet_Create(void); +IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*); IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*); void detach_selection(HTMLDocument*); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index aac9a87..8f2876c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -123,7 +123,8 @@ typedef nsISupports nsIPrincipal; typedef nsISupports nsIAtom; typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; -typedef nsISupports nsIDOMStyleSheet; +typedef nsISupports nsIDOMMediaList; +typedef nsISupports nsIDOMCSSRuleList; [ object, @@ -572,6 +573,36 @@ interface nsIDOMCSSStyleDeclaration : nsISupports [ object, + uuid(a6cf9080-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMStyleSheet : nsISupports +{ + nsresult GetType(nsAString *aType); + nsresult GetDisabled(PRBool *aDisabled); + nsresult SetDisabled(PRBool aDisabled); + nsresult GetOwnerNode(nsIDOMNode **aOwnerNode); + nsresult GetParentStyleSheet(nsIDOMStyleSheet **aParentStyleSheet); + nsresult GetHref(nsAString *aHref); + nsresult GetTitle(nsAString *aTitle); + nsresult GetMedia(nsIDOMMediaList **aMedia); +} + +[ + object, + uuid(a6cf90c2-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMCSSStyleSheet : nsIDOMStyleSheet +{ + nsresult GetOwnerRule(nsIDOMCSSRule **aOwnerRule); + nsresult GetCssRules(nsIDOMCSSRuleList **aCssRules); + nsresult InsertRule(const nsAString *rule, PRUint32 index, PRUint32 *_retval); + nsresult DeleteRule(PRUint32 index); +} + +[ + object, uuid(a6cf9081-15b3-11d2-932e-00805f8add32) /* FROZEN */ ]

1 0

James Hawkins : msi: Downgrade a FIXME to a WARN.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 8912798fb5d4d70c22386be07d0e8141a99ff79a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8912798fb5d4d70c22386be07… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 25 18:04:25 2007 -0600 msi: Downgrade a FIXME to a WARN. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a44b918..269aa3a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -226,7 +226,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeInScript) { if (type & msidbCustomActionTypeNoImpersonate) - FIXME("msidbCustomActionTypeNoImpersonate not handled\n"); + WARN("msidbCustomActionTypeNoImpersonate not handled\n"); if (type & msidbCustomActionTypeRollback) {

1 0