October 2009 - Wine-commits

Henri Verbeet : wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: a24d14796a47eea5a199fdf316a619d723d230d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24d14796a47eea5a199fdf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:17 2009 +0200 wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info. --- dlls/wined3d/device.c | 2 - dlls/wined3d/stateblock.c | 52 ++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a94c4bb..33c15ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2485,7 +2485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I list_add_head(&This->updateStateBlock->lightMap[Hi], &object->entry); object->glIndex = -1; object->OriginalIndex = Index; - object->changed = TRUE; } /* Initialize the object */ @@ -2636,7 +2635,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D } } - lightInfo->enabledChanged = TRUE; if(!Enable) { if(lightInfo->glIndex != -1) { if(!This->isRecordingState) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 74a9f3a..862eb66 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -447,8 +447,6 @@ static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct li struct wined3d_light_info *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); *dst_light = *src_light; - dst_light->changed = TRUE; - dst_light->enabledChanged = TRUE; list_add_tail(&stateblock->lightMap[i], &dst_light->entry); } } @@ -561,42 +559,34 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock LIST_FOR_EACH(e, &This->lightMap[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - if (!src->changed && !src->enabledChanged) continue; /* Look up the light in the destination */ LIST_FOR_EACH(f, &targetStateBlock->lightMap[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if(realLight->OriginalIndex == src->OriginalIndex) { - if(src->changed) { - src->OriginalParms = realLight->OriginalParms; + if (realLight->OriginalIndex == src->OriginalIndex) + { + src->OriginalParms = realLight->OriginalParms; + + if (realLight->glIndex == -1 && src->glIndex != -1) + { + /* Light disabled */ + This->activeLights[src->glIndex] = NULL; } - if(src->enabledChanged) { - /* Need to double check because enabledChanged does not catch enabled -> disabled -> enabled - * or disabled -> enabled -> disabled changes - */ - if(realLight->glIndex == -1 && src->glIndex != -1) { - /* Light disabled */ - This->activeLights[src->glIndex] = NULL; - } else if(realLight->glIndex != -1 && src->glIndex == -1){ - /* Light enabled */ - This->activeLights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; + else if (realLight->glIndex != -1 && src->glIndex == -1) + { + /* Light enabled */ + This->activeLights[realLight->glIndex] = src; } + src->glIndex = realLight->glIndex; updated = TRUE; break; } } - if(updated) { - /* Found a light, all done, proceed with next hash entry */ - continue; - } else if(src->changed) { - /* Otherwise assign defaul params */ - src->OriginalParms = WINED3D_default_light; - } else { - /* Not enabled by default */ - src->glIndex = -1; + if (!updated) + { + ERR("Light %u in stateblock %p does not exist in device stateblock %p.\n", + src->OriginalIndex, This, targetStateBlock); } } } @@ -987,12 +977,8 @@ static void apply_lights(IWineD3DDevice *pDevice, const IWineD3DStateBlockImpl * { const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); - if(light->changed) { - IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); - } - if(light->enabledChanged) { - IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); - } + IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms); + IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4077d81..69467e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1208,8 +1208,6 @@ struct wined3d_light_info WINED3DLIGHT OriginalParms; /* Note D3D8LIGHT == D3D9LIGHT */ DWORD OriginalIndex; LONG glIndex; - BOOL changed; - BOOL enabledChanged; BOOL enabled; /* Converted parms to speed up swapping lights */

1 0

Henri Verbeet : wined3d: Simplify IWineD3DStateBlockImpl_Capture().
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 1f029a30dbae7d40818d0d81bc84d15c93578c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f029a30dbae7d40818d0d81b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:18 2009 +0200 wined3d: Simplify IWineD3DStateBlockImpl_Capture(). Consistently use the stateblock's contained states to determine what to capture. --- dlls/wined3d/stateblock.c | 556 +++++++++++++++++++-------------------------- 1 files changed, 230 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f029a30dbae7d40818d0…

1 0

Henri Verbeet : wined3d: Merge some bitfields in struct SAVEDSTATES.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: bac64865206a23eaa9aeb40b4a095beb917ae5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac64865206a23eaa9aeb40b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:19 2009 +0200 wined3d: Merge some bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69467e0..c9097cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,7 +2079,6 @@ typedef struct SAVEDSTATES { DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ @@ -2087,15 +2086,16 @@ typedef struct SAVEDSTATES { WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ BOOL *vertexShaderConstantsF; - WORD primitive_type : 1; - WORD indices : 1; - WORD material : 1; - WORD viewport : 1; - WORD vertexDecl : 1; - WORD pixelShader : 1; - WORD vertexShader : 1; - WORD scissorRect : 1; - WORD padding : 1; + DWORD textures : 20; /* MAX_COMBINED_SAMPLERS, 20 */ + DWORD primitive_type : 1; + DWORD indices : 1; + DWORD material : 1; + DWORD viewport : 1; + DWORD vertexDecl : 1; + DWORD pixelShader : 1; + DWORD vertexShader : 1; + DWORD scissorRect : 1; + DWORD padding : 4; } SAVEDSTATES; struct StageState {

1 0

Jörg Höhle : winmm: MCI notification is controlled by keyword only.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: d48d923df302274bf457a7ebe61aab3fd90dc4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48d923df302274bf457a7ebe… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 13 08:00:03 2009 +0200 winmm: MCI notification is controlled by keyword only. --- dlls/winmm/mci.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 216fb2a..32204a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1433,12 +1433,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, goto errCleanUp; } - /* set up call back */ - if (hwndCallback != 0) { - dwFlags |= MCI_NOTIFY; - data[0] = (DWORD)hwndCallback; - } - /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; @@ -1454,6 +1448,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if ((dwRet = MCI_ParseOptArgs(data, offset, lpCmd, args, &dwFlags))) goto errCleanUp; + /* set up call back */ + if (dwFlags & MCI_NOTIFY) { + data[0] = (DWORD)hwndCallback; + } + /* FIXME: the command should get it's own notification window set up and * ask for device closing while processing the notification mechanism */

1 0

Jacek Caban : mshtml: Added IHTMLBaseFrame interface stub implementation.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: a4deae49b37397d4f9dfcf179ea904e377771869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4deae49b37397d4f9dfcf179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:49:13 2009 +0200 mshtml: Added IHTMLBaseFrame interface stub implementation. --- dlls/mshtml/htmliframe.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 1 + 2 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index a482a5b..4ddff4e 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; + const IHTMLFrameBaseVtbl *lpIHTMLFrameBaseVtbl; const IHTMLFrameBase2Vtbl *lpIHTMLFrameBase2Vtbl; LONG ref; @@ -41,6 +42,7 @@ typedef struct { HTMLWindow *content_window; } HTMLIFrame; +#define HTMLFRAMEBASE(x) (&(x)->lpIHTMLFrameBaseVtbl) #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc, HTMLWindow **ret) @@ -77,6 +79,217 @@ static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc return hres; } +#define HTMLFRAMEBASE_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase, iface) + +static HRESULT WINAPI HTMLIFrameBase_QueryInterface(IHTMLFrameBase *iface, REFIID riid, void **ppv) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); +} + +static ULONG WINAPI HTMLIFrameBase_AddRef(IHTMLFrameBase *iface) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); +} + +static ULONG WINAPI HTMLIFrameBase_Release(IHTMLFrameBase *iface) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); +} + +static HRESULT WINAPI HTMLIFrameBase_GetTypeInfoCount(IHTMLFrameBase *iface, UINT *pctinfo) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); +} + +static HRESULT WINAPI HTMLIFrameBase_GetTypeInfo(IHTMLFrameBase *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLIFrameBase_GetIDsOfNames(IHTMLFrameBase *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLIFrameBase_Invoke(IHTMLFrameBase *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + + return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLIFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_name(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_border(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_border(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_frameBorder(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_frameBorder(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_frameSpacing(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_frameSpacing(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_marginWidth(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_marginHeight(IHTMLFrameBase *iface, VARIANT v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARIANT *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_noResize(IHTMLFrameBase *iface, VARIANT_BOOL v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%x)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_noResize(IHTMLFrameBase *iface, VARIANT_BOOL *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameBase_get_scrolling(IHTMLFrameBase *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLFRAMEBASE_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLFrameBaseVtbl HTMLIFrameBaseVtbl = { + HTMLIFrameBase_QueryInterface, + HTMLIFrameBase_AddRef, + HTMLIFrameBase_Release, + HTMLIFrameBase_GetTypeInfoCount, + HTMLIFrameBase_GetTypeInfo, + HTMLIFrameBase_GetIDsOfNames, + HTMLIFrameBase_Invoke, + HTMLIFrameBase_put_src, + HTMLIFrameBase_get_src, + HTMLIFrameBase_put_name, + HTMLIFrameBase_get_name, + HTMLIFrameBase_put_border, + HTMLIFrameBase_get_border, + HTMLIFrameBase_put_frameBorder, + HTMLIFrameBase_get_frameBorder, + HTMLIFrameBase_put_frameSpacing, + HTMLIFrameBase_get_frameSpacing, + HTMLIFrameBase_put_marginWidth, + HTMLIFrameBase_get_marginWidth, + HTMLIFrameBase_put_marginHeight, + HTMLIFrameBase_get_marginHeight, + HTMLIFrameBase_put_noResize, + HTMLIFrameBase_get_noResize, + HTMLIFrameBase_put_scrolling, + HTMLIFrameBase_get_scrolling +}; + #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) static HRESULT WINAPI HTMLIFrameBase2_QueryInterface(IHTMLFrameBase2 *iface, REFIID riid, void **ppv) @@ -265,7 +478,10 @@ static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = NULL; - if(IsEqualGUID(&IID_IHTMLFrameBase2, riid)) { + if(IsEqualGUID(&IID_IHTMLFrameBase, riid)) { + TRACE("(%p)->(IID_IHTMLFrameBase %p)\n", This, ppv); + *ppv = HTMLFRAMEBASE(This); + }else if(IsEqualGUID(&IID_IHTMLFrameBase2, riid)) { TRACE("(%p)->(IID_IHTMLFrameBase2 %p)\n", This, ppv); *ppv = HTMLFRAMEBASE2(This); }else { @@ -319,6 +535,7 @@ HTMLElement *HTMLIFrame_Create(nsIDOMHTMLElement *nselem) ret = heap_alloc_zero(sizeof(HTMLIFrame)); + ret->lpIHTMLFrameBaseVtbl = &HTMLIFrameBaseVtbl; ret->lpIHTMLFrameBase2Vtbl = &HTMLIFrameBase2Vtbl; ret->element.node.vtbl = &HTMLIFrameImplVtbl; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f826a01..d319c03 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -304,6 +304,7 @@ static const IID * const iframe_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLElement3, + &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IDispatchEx, &IID_IConnectionPointContainer,

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase IDispatchEx support.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: f6b89e9f1562242aab18f0c4b802aedc669ddbff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b89e9f1562242aab18f0c4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:49:34 2009 +0200 mshtml: Added IHTMLFrameBase IDispatchEx support. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4092374..210c3ae 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -123,6 +123,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElement4, &IID_IHTMLElementCollection, &IID_IHTMLEventObj, + &IID_IHTMLFrameBase, &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, &IID_IHTMLImgElement, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 4ddff4e..7af0070 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -517,6 +517,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { IHTMLElement_tid, IHTMLElement2_tid, IHTMLElement3_tid, + IHTMLFrameBase_tid, IHTMLFrameBase2_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c92bb25..4106500 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -101,6 +101,7 @@ typedef enum { IHTMLElement4_tid, IHTMLElementCollection_tid, IHTMLEventObj_tid, + IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLGenericElement_tid, IHTMLImgElement_tid,

1 0

Jacek Caban : mshtml: Use DISPATCH_* macros instead of INVOKE_*.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: d43ab58efb1a27dbbe1511c4d9d5a039aa4b9ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43ab58efb1a27dbbe1511c4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:02 2009 +0200 mshtml: Use DISPATCH_* macros instead of INVOKE_*. --- dlls/mshtml/dispex.c | 9 +++++---- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 210c3ae..4079242 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -221,7 +221,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN data->funcs[data->func_cnt].id = desc->memid; data->funcs[data->func_cnt].tid = tid; - data->funcs[data->func_cnt].func_disp_idx = desc->invkind == INVOKE_FUNC ? data->func_disp_cnt++ : -1; + data->funcs[data->func_cnt].func_disp_idx = desc->invkind == DISPATCH_METHOD ? data->func_disp_cnt++ : -1; data->func_cnt++; } @@ -572,6 +572,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, switch(flags) { case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { @@ -809,7 +810,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc var = &This->dynamic_data->props[idx].var; switch(wFlags) { - case INVOKE_FUNC: { + case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1}; IDispatchEx *dispex; @@ -848,9 +849,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc heap_free(dp.rgvarg); return hres; } - case INVOKE_PROPERTYGET: + case DISPATCH_PROPERTYGET: return VariantCopy(pvarRes, var); - case INVOKE_PROPERTYPUT: + case DISPATCH_PROPERTYPUT: VariantClear(var); return VariantCopy(var, pdp->rgvarg); default: diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 743cc06..70827bc 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -397,7 +397,7 @@ static HRESULT HTMLElementCollection_invoke(IUnknown *iface, DISPID id, LCID lci return DISP_E_UNKNOWNNAME; switch(flags) { - case INVOKE_PROPERTYGET: + case DISPATCH_PROPERTYGET: V_VT(res) = VT_DISPATCH; V_DISPATCH(res) = (IDispatch*)HTMLELEM(This->elems[idx]); IHTMLElement_AddRef(HTMLELEM(This->elems[idx])); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1c7b7cb..9227899 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -208,7 +208,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(IUnknown *iface, DISPID id, LCID TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); switch(flags) { - case INVOKE_PROPERTYGET: { + case DISPATCH_PROPERTYGET: { IDispatch *disp = NULL; HRESULT hres;

1 0

Jacek Caban : mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET calls to InvokeEx implementation .
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b7c257bb48e299bc710eb43ff1b028d01f21f576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c257bb48e299bc710eb43ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:28 2009 +0200 mshtml: Added support for DISPATCH_METHOD|DISPATCH_PROPERTYGET calls to InvokeEx implementation. --- dlls/mshtml/dispex.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4079242..fc8bd55 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -221,7 +221,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN data->funcs[data->func_cnt].id = desc->memid; data->funcs[data->func_cnt].tid = tid; - data->funcs[data->func_cnt].func_disp_idx = desc->invkind == DISPATCH_METHOD ? data->func_disp_cnt++ : -1; + data->funcs[data->func_cnt].func_disp_idx = (desc->invkind & DISPATCH_METHOD) ? data->func_disp_cnt++ : -1; data->func_cnt++; } @@ -515,6 +515,9 @@ static HRESULT function_value(IUnknown *iface, LCID lcid, WORD flags, DISPPARAMS HRESULT hres; switch(flags) { + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!res) + return E_INVALIDARG; case DISPATCH_METHOD: hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; @@ -571,8 +574,10 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, HRESULT hres; switch(flags) { - case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!res) + return E_INVALIDARG; + case DISPATCH_METHOD: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; case DISPATCH_PROPERTYGET: { @@ -810,6 +815,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc var = &This->dynamic_data->props[idx].var; switch(wFlags) { + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + if(!pvarRes) + return E_INVALIDARG; case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1};

1 0

Jacek Caban : mshtml: Return failure in GetContentType if content type is not available.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 1d134f74ab8aa4c83d40594b2c2ce3852d3f2649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d134f74ab8aa4c83d40594b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 20:50:55 2009 +0200 mshtml: Return failure in GetContentType if content type is not available. --- dlls/mshtml/nsio.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f10db48..6c0217f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -502,9 +502,8 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString if(This->channel) return nsIChannel_GetContentType(This->channel, aContentType); - TRACE("returning default text/html\n"); - nsACString_SetData(aContentType, "text/html"); - return NS_OK; + WARN("unknown type\n"); + return NS_ERROR_FAILURE; } static nsresult NSAPI nsChannel_SetContentType(nsIHttpChannel *iface,

1 0

Paul Vriens : advapi32/tests: Fix a test failure on W2K and lower.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: b4955e57793b8c241ec5ed7f71b61739dad425f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4955e57793b8c241ec5ed7f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 13 20:55:34 2009 +0200 advapi32/tests: Fix a test failure on W2K and lower. --- dlls/advapi32/tests/crypt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 08c53f0..e4b5934 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -968,7 +968,10 @@ static void hashtest(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); - ok(ret, "CryptImportKey error %u\n", GetLastError()); + /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %u\n", GetLastError()); pCryptDestroyKey(hkey); pCryptReleaseContext(provider, 0);

1 0