July 2008 - Wine-Commits - list.winehq.org

Rob Shearman : oleaut32: Load string constants correctly from SLTG typelibs .
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: a2c1bdf1f853352d0895629f33554e0e82971e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c1bdf1f853352d0895629f3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:05:28 2008 +0100 oleaut32: Load string constants correctly from SLTG typelibs. --- dlls/oleaut32/typelib.c | 51 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index aa4c178..dae9ff1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3122,6 +3122,17 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs); TRACE_(typelib)("memid = 0x%x\n", pItem->memid); + if(pItem->flags & 0x02) + pType = &pItem->type; + else + pType = (WORD*)(pBlk + pItem->type); + + if (pItem->flags & ~0xda) + FIXME_(typelib)("unhandled flags = %02x\n", pItem->flags & ~0xda); + + SLTG_DoElem(pType, pBlk, + &(*ppVarDesc)->vardesc.elemdescVar, ref_lookup); + if (pItem->flags & 0x40) { TRACE_(typelib)("VAR_DISPATCH\n"); (*ppVarDesc)->vardesc.varkind = VAR_DISPATCH; @@ -3134,9 +3145,32 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT; if (pItem->flags & 0x08) V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = pItem->byte_offs; - else - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = - *(INT*)(pBlk + pItem->byte_offs); + else { + switch ((*ppVarDesc)->vardesc.elemdescVar.tdesc.vt) + { + case VT_LPSTR: + case VT_LPWSTR: + case VT_BSTR: + { + WORD len = *(WORD *)(pBlk + pItem->byte_offs); + INT alloc_len = MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, NULL, 0); + BSTR str = SysAllocStringLen(NULL, alloc_len); + MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, str, alloc_len); + V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_BSTR; + V_BSTR((*ppVarDesc)->vardesc.u.lpvarValue) = str; + break; + } + case VT_I2: + case VT_UI2: + case VT_I4: + case VT_UI4: + V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = + *(INT*)(pBlk + pItem->byte_offs); + break; + default: + FIXME("VAR_CONST unimplemented for type %d\n", (*ppVarDesc)->vardesc.elemdescVar.tdesc.vt); + } + } } else { TRACE_(typelib)("VAR_PERINSTANCE\n"); @@ -3150,17 +3184,6 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign if (pItem->flags & 0x80) (*ppVarDesc)->vardesc.wVarFlags |= VARFLAG_FREADONLY; - if(pItem->flags & 0x02) - pType = &pItem->type; - else - pType = (WORD*)(pBlk + pItem->type); - - if (pItem->flags & ~0xda) - FIXME_(typelib)("unhandled flags = %02x\n", pItem->flags & ~0xda); - - SLTG_DoElem(pType, pBlk, - &(*ppVarDesc)->vardesc.elemdescVar, ref_lookup); - if (TRACE_ON(typelib)) { char buf[300]; dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf);

1 0

H. Verbeet : wined3d: Specify the GLSL language version our shaders are written to.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: d76de4eede91634011a93b05b5a0fe1b1b6a8028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76de4eede91634011a93b05b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 30 23:03:47 2008 +0200 wined3d: Specify the GLSL language version our shaders are written to. This prevents some driver warnings when using language features from 1.20, like "first class arrays". --- dlls/wined3d/glsl_shader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1f5df18..a9ab92c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2988,6 +2988,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs buffer.lineNo = 0; buffer.newline = TRUE; + shader_addline(&buffer, "#version 120\n"); + if(vs_major < 3 && ps_major < 3) { /* That one is easy: The vertex shader writes to the builtin varyings, the pixel shader reads from them. * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline @@ -3310,6 +3312,7 @@ static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { GLhandleARB program_id; GLhandleARB vshader_id, pshader_id; const char *blt_vshader[] = { + "#version 120\n" "void main(void)\n" "{\n" " gl_Position = gl_Vertex;\n" @@ -3320,6 +3323,7 @@ static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { }; const char *blt_pshader[] = { + "#version 120\n" "uniform sampler2D sampler;\n" "void main(void)\n" "{\n" @@ -3494,6 +3498,8 @@ static void shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFF /* Create the hw GLSL shader object and assign it as the baseShader.prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + shader_addline(buffer, "#version 120\n"); + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { shader_addline(buffer, "#extension GL_ARB_draw_buffers : enable\n"); } @@ -3579,6 +3585,8 @@ static void shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUF /* Create the hw GLSL shader program and assign it as the baseShader.prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); + shader_addline(buffer, "#version 120\n"); + /* Base Declarations */ shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION);

1 0

Rob Shearman : oleaut32: Implement the 0x08 flag in SLTG_DoVars.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 45989a1ff1268480e9cf4697881a12bd664e15e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45989a1ff1268480e9cf46978… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:04:33 2008 +0100 oleaut32: Implement the 0x08 flag in SLTG_DoVars. It means that the data is stored directly in pItem->byte_offs instead of the byte offset pointed to by it. --- dlls/oleaut32/typelib.c | 19 +++++++++++++------ dlls/oleaut32/typelib.h | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 43aedc5..aa4c178 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3099,7 +3099,6 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign SLTG_Variable *pItem; unsigned short i; WORD *pType; - char buf[300]; for(pItem = (SLTG_Variable *)pFirstItem, i = 0; i < cVars; pItem = (SLTG_Variable *)(pBlk + pItem->next), i++) { @@ -3119,6 +3118,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign else (*ppVarDesc)->Name = TLB_MultiByteToBSTR(pItem->name + pNameTable); + TRACE_(typelib)("name: %s\n", debugstr_w((*ppVarDesc)->Name)); TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs); TRACE_(typelib)("memid = 0x%x\n", pItem->memid); @@ -3132,8 +3132,11 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign (*ppVarDesc)->vardesc.u.lpvarValue = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT)); V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_INT; - V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = - *(INT*)(pBlk + pItem->byte_offs); + if (pItem->flags & 0x08) + V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = pItem->byte_offs; + else + V_UNION((*ppVarDesc)->vardesc.u.lpvarValue, intVal) = + *(INT*)(pBlk + pItem->byte_offs); } else { TRACE_(typelib)("VAR_PERINSTANCE\n"); @@ -3152,13 +3155,17 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign else pType = (WORD*)(pBlk + pItem->type); - if (pItem->flags & ~0xd2) - FIXME_(typelib)("unhandled flags = %02x\n", pItem->flags & ~0xd2); + if (pItem->flags & ~0xda) + FIXME_(typelib)("unhandled flags = %02x\n", pItem->flags & ~0xda); SLTG_DoElem(pType, pBlk, &(*ppVarDesc)->vardesc.elemdescVar, ref_lookup); - dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf); + if (TRACE_ON(typelib)) { + char buf[300]; + dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf); + TRACE_(typelib)("elemdescVar: %s\n", buf); + } bstrPrevName = (*ppVarDesc)->Name; ppVarDesc = &((*ppVarDesc)->next); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index b25f031..821981f 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -576,7 +576,7 @@ typedef struct { BYTE flags; WORD next; WORD name; - WORD byte_offs; /* pos in struct, or offset to const type */ + WORD byte_offs; /* pos in struct, or offset to const type or const data (if flags & 0x08) */ WORD type; /* if flags & 0x02 this is the type, else offset to type */ DWORD memid; WORD helpcontext; /* ?? */

1 0

Jacek Caban : mshtml: Silence common invalid FIXME.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 4171385cd96dc8fee6774afdcf6861d153f54cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4171385cd96dc8fee6774afdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:47:16 2008 +0200 mshtml: Silence common invalid FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4a2c696..b77d69e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -134,6 +134,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IRunnableObject, riid)) { TRACE("(%p)->(IID_IRunnableObject %p) returning NULL\n", This, ppvObject); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IPersistPropertyBag, riid)) { + TRACE("(%p)->(IID_IPersistPropertyBag %p) returning NULL\n", This, ppvObject); + return E_NOINTERFACE; }else if(dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 27248df..4de5286 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3720,6 +3720,11 @@ static void test_QueryInterface(IUnknown *unk) ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + + qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, ezpected NULL\n", qi);

1 0

H. Verbeet : wined3d: Use ModifyLocation() to force a reload on color key change.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: d5cbb8375e191d9169611881e4625fe0e75a39bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5cbb8375e191d9169611881e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 30 23:03:42 2008 +0200 wined3d: Use ModifyLocation() to force a reload on color key change. Just unsetting SFLAG_INTEXTURE doesn't work for FBOs because the drawable and texture are the same there (and ModifyLocation() is the correct way to do this anyway). Fixes another ddraw test failure with FBO ORM. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 48e13fe..0171e31 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2281,7 +2281,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); /* Make sure the texture is reloaded because of the color key change, this kills performance though :( */ /* TODO: This is not necessarily needed with hw palettized texture support */ - This->Flags &= ~SFLAG_INTEXTURE; + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } else { TRACE("surface is already in texture\n"); return WINED3D_OK;

1 0

Jacek Caban : mshtml: Ignore fdexNameImplicit flag.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 4fdbdaf0b91f97e840b0f1a031b8e6ad0982c124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdbdaf0b91f97e840b0f1a03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:40:25 2008 +0200 mshtml: Ignore fdexNameImplicit flag. --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/tests/script.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5d472ee..4e44130 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -407,7 +407,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure)) + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) FIXME("Unsupported grfdex %x\n", grfdex); data = get_dispex_data(This); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 89e17fe..bbd9c3c 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -477,8 +477,10 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac tmp = SysAllocString(testW); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive, &id); - SysFreeString(tmp); ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive | fdexNameImplicit, &id); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + SysFreeString(tmp); id = 0; tmp = SysAllocString(testW);

1 0

Alexandre Julliard : widl: Add some support for unencapsulated unions that need a conformance descriptor .
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: e213ac9aca129c944d50dcc5158c778c9b96ecc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e213ac9aca129c944d50dcc51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 1 12:25:44 2008 +0200 widl: Add some support for unencapsulated unions that need a conformance descriptor. --- dlls/rpcrt4/tests/server.c | 19 +++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 7 +++++++ tools/widl/typegen.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 69b9ba4..0bf84d5 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -333,6 +333,18 @@ s_square_encu(encu_t *eu) } } +double +s_square_unencu(int t, unencu_t *eu) +{ + switch (t) + { + case ENCU_I: return eu->i * eu->i; + case ENCU_F: return eu->f * eu->f; + default: + return 0.0; + } +} + void s_check_se2(se_t *s) { @@ -844,6 +856,7 @@ union_tests(void) { encue_t eue; encu_t eu; + unencu_t uneu; sun_t su; int i; @@ -872,6 +885,12 @@ union_tests(void) eu.tagged_union.f = 3.0; ok(square_encu(&eu) == 9.0, "RPC square_encu\n"); + uneu.i = 4; + ok(square_unencu(ENCU_I, &uneu) == 16.0, "RPC square_unencu\n"); + + uneu.f = 5.0; + ok(square_unencu(ENCU_F, &uneu) == 25.0, "RPC square_unencu\n"); + eue.t = E1; eue.tagged_union.i1 = 8; ok(square_encue(&eue) == 64.0, "RPC square_encue\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 378b205..26d3373 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -195,6 +195,12 @@ cpp_quote("#endif") case ENCU_F: float f; } encu_t; + typedef [switch_type(int)] union unencu + { + [case (ENCU_I)] int i; + [case (ENCU_F)] float f; + } unencu_t; + typedef enum { E1 = 23, @@ -215,6 +221,7 @@ cpp_quote("#endif") } se_t; double square_encu(encu_t *eu); + double square_unencu(int t, [switch_is(t)] unencu_t *eu); int sum_parr(int *a[3]); int sum_pcarr([size_is(n)] int *a[], int n); int enum_ord(e_t e); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f89f13f..f7a189a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2032,6 +2032,34 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) error("union switch type must be an integer, char, or enum\n"); } } + else if (is_attr(type->attrs, ATTR_SWITCHTYPE)) + { + static const expr_t dummy_expr; /* FIXME */ + const type_t *st = get_attrp(type->attrs, ATTR_SWITCHTYPE); + + switch (st->type) + { + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); + print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", + st->type, string_of_type(st->type)); + *tfsoff += 2; + break; + default: + error("union switch type must be an integer, char, or enum\n"); + } + + *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); + } + print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch); *tfsoff += 4;

1 0

Jacek Caban : mshtml: Return NULL in window object's GetNameSpaceParent.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 9157c6d68ac2ccaaf06ca6440ffeab0afa10f211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9157c6d68ac2ccaaf06ca6440… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:40:09 2008 +0200 mshtml: Return NULL in window object's GetNameSpaceParent. --- dlls/mshtml/htmlwindow.c | 3 ++- dlls/mshtml/tests/script.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b79067a..45c6cb7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1127,7 +1127,8 @@ static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnkno TRACE("(%p)->(%p)\n", This, ppunk); - return IDispatchEx_GetNameSpaceParent(DISPATCHEX(&This->dispex), ppunk); + *ppunk = NULL; + return S_OK; } #undef DISPEX_THIS diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 8b4ddbf..89e17fe 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -439,6 +439,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { IDispatchEx *document; + IUnknown *unk; VARIANT var; DISPPARAMS dp; EXCEPINFO ei; @@ -510,6 +511,12 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(V_I4(&var) == 100, "V_I4(&var) == NULL\n"); IDispatchEx_Release(document); + + unk = (void*)0xdeadbeef; + hres = IDispatchEx_GetNameSpaceParent(window_dispex, &unk); + ok(hres == S_OK, "GetNameSpaceParent failed: %08x\n", hres); + ok(!unk, "unk=%p, expected NULL\n", unk); + return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::[get|put]_alt implementation.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 4690d6d572ea83750b1dda945264afafbb428fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4690d6d572ea83750b1dda945… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:39:36 2008 +0200 mshtml: Added IHTMLImgElement::[get|put]_alt implementation. --- dlls/mshtml/htmlimg.c | 34 ++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index a2494df..e0c0619 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -228,15 +228,41 @@ static HRESULT WINAPI HTMLImgElement_get_hspace(IHTMLImgElement *iface, long *p) static HRESULT WINAPI HTMLImgElement_put_alt(IHTMLImgElement *iface, BSTR v) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString alt_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_Init(&alt_str, v); + nsres = nsIDOMHTMLImageElement_SetAlt(This->nsimg, &alt_str); + nsAString_Finish(&alt_str); + if(NS_FAILED(nsres)) + ERR("SetAlt failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_alt(IHTMLImgElement *iface, BSTR *p) { HTMLImgElement *This = HTMLIMG_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString alt_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&alt_str, NULL); + nsres = nsIDOMHTMLImageElement_GetAlt(This->nsimg, &alt_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *alt; + + nsAString_GetData(&alt_str, &alt); + *p = *alt ? SysAllocString(alt) : NULL; + }else { + ERR("GetAlt failed: %08x\n", nsres); + } + nsAString_Finish(&alt_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 92a240e..dd2d303 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -411,6 +411,17 @@ static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) return node; } +#define get_img_iface(u) _get_img_iface(__LINE__,u) +static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) +{ + IHTMLImgElement *img; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLImgElement, (void**)&img); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLImgElement: %08x\n", hres); + return img; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -932,13 +943,10 @@ static long _get_node_type(unsigned line, IUnknown *unk) #define test_img_set_src(u,s) _test_img_set_src(__LINE__,u,s) static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) { - IHTMLImgElement *img; + IHTMLImgElement *img = _get_img_iface(line, unk); BSTR tmp; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLImgElement, (void**)&img); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLImgElement: %08x\n", hres); - tmp = a2bstr(src); hres = IHTMLImgElement_put_src(img, tmp); IHTMLImgElement_Release(img); @@ -946,6 +954,37 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); } +#define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) +static void _test_img_alt(unsigned line, IUnknown *unk, const char *exalt) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + BSTR alt; + HRESULT hres; + + hres = IHTMLImgElement_get_alt(img, &alt); + ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08x\n", hres); + if(exalt) + ok_(__FILE__,line) (!strcmp_wa(alt, exalt), "inexopected alt %s\n", dbgstr_w(alt)); + else + ok_(__FILE__,line) (!alt, "alt != NULL\n"); + SysFreeString(alt); +} + +#define test_img_set_alt(u,a) _test_img_set_alt(__LINE__,u,a) +static void _test_img_set_alt(unsigned line, IUnknown *unk, const char *alt) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(alt); + hres = IHTMLImgElement_put_alt(img, tmp); + ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08x\n", hres); + SysFreeString(tmp); + + _test_img_alt(line, unk, alt); +} + #define test_input_get_disabled(i,b) _test_input_get_disabled(__LINE__,i,b) static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) { @@ -2167,6 +2206,8 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, imgidW, TRUE); if(elem) { test_img_set_src((IUnknown*)elem, "about:blank"); + test_img_alt((IUnknown*)elem, NULL); + test_img_set_alt((IUnknown*)elem, "alt test"); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLStyle::[get|put]_width implementation.
by Alexandre Julliard July 1, 2008

July 1, 2008

Module: wine Branch: master Commit: 45eba140e616504e12070b5b4c461e836e7f050a URL: http://source.winehq.org/git/wine.git/?a=commit;h=45eba140e616504e12070b5b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 30 21:39:52 2008 +0200 mshtml: Added IHTMLStyle::[get|put]_width implementation. --- dlls/mshtml/htmlstyle.c | 21 ++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 83a587f..e4bc483 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -73,6 +73,8 @@ static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; static const WCHAR attrVisibility[] = {'v','i','s','i','b','i','l','i','t','y',0}; +static const WCHAR attrWidth[] = + {'w','i','d','t','h',0}; static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; @@ -1237,15 +1239,28 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftStyle(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_width(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + TRACE("%s\n", debugstr_w(V_BSTR(&v))); + return set_style_attr(This, attrWidth, V_BSTR(&v), 0); + default: + FIXME("unsupported vt %d\n", V_VT(&v)); + } + return E_NOTIMPL; } static HRESULT WINAPI HTMLStyle_get_width(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_BSTR; + return get_style_attr(This, attrWidth, &V_BSTR(p)); } static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dd2d303..4540ed4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1817,6 +1817,25 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v)=%p\n", V_BSTR(&v)); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("auto"); + hres = IHTMLStyle_put_width(style, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "auto"), "V_BSTR(v)=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_default_selection(IHTMLDocument2 *doc)

1 0