March 2012 - Wine-Devel - list.winehq.org

Re: jscript: Add VT_I2 support (try 2)

by Jacek Caban

Hi Alistair, On 03/30/12 12:29, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > jscript: Add VT_I2 support > hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + if(SUCCEEDED(hres) && retv) + { + if(V_VT(retv) == VT_I2) + VariantChangeType(retv, retv, 0, VT_I4); + } Since the conversion here is trivial, why not do it directly? --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -191,6 +191,10 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret case VT_R8: *ret = *v; break; + case VT_I2: + V_VT(ret) = VT_I4; + V_I4(ret) = V_I2(v); + break; I thought the findings we've discussed off-list was that internal values should never be of VT_I2 types, so this should never happen. If it's not the case, I'd like to see a test case. +function TestVT_I2() +{ + varI2 = GetShort(); + num3 = 3 + + ok(getVT(varI2) === "VT_I4", "getVT(varI2) = " + getVT(varI2)); Please include getVT(GetShort()) test I've showed you. This eliminates a lot of flow of value. + if(!strcmp_wa(bstrName, "GetShort")) { + *pid = DISPID_GLOBAL_SHORT; + return S_OK; + } Please follow JavaScript names convention (this should be getShort). Cheers, Jacek

March 30, 2012

Re: [2/2] scrrun: Add scrrun tests (try 3)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17581 Your paranoid android. === WINEBUILD (build) === Make failed

March 30, 2012

Re: gdi32: Add support for loading scalable font resources.

by Dmitry Timoshkov

Huw Davies <huw(a)codeweavers.com> wrote: > > > + if (size.u.LowPart < sizeof( *dos )) goto fail; > > > > Testing LowPart only could not work for large sizes. > > Of course, but we don't care if very large files fail, they won't be > genuine resource files anyway. Then returning 64-bit sizes doesn't make sence, and large sizes should be detected and rejected. -- Dmitry.

March 30, 2012

Re: gdi32: Add support for loading scalable font resources.

by Huw Davies

On Fri, Mar 30, 2012 at 07:31:54PM +0900, Dmitry Timoshkov wrote: > Huw Davies <huw(a)codeweavers.com> wrote: > > > + if (size.u.LowPart < sizeof( *dos )) goto fail; > > Testing LowPart only could not work for large sizes. Of course, but we don't care if very large files fail, they won't be genuine resource files anyway. Huw.

March 30, 2012

[PATCH 3/3] dmsynth: Put port caps that match native ones.

by Joerg-Cyril.Hoehle＠t-systems.com

Hi, Andrew Eikum asked Christian Costa: >Just to be clear, which "native" do you mean? Does this match Windows >7's dmusic behavior, or something else? I've been trying to target >Windows 7's behavior in the new audio design. A w7 target makes a lot of sense for mmdevapi/WASAPI. However, isn't DMusic a thing of the past? In that case, I argue that DSound and DMusic should target the "best in class" native OS of the time where apps were written using these APIs, because the app writers "optimized" their apps to the behaviour they could observe. Wouldn't "best in class" mean XP for DSound/DMusic? For similar reasons, the MCI should mimic w9x(/wxp) behaviour, because that's what was available when apps using the MCI were developed. I prefer to hear "thank you guys, app X works like a charm in Wine like it worked on my rusty w98 and later xp box, whereas it refuses to run on w7" rather than "you guys do a great job of making my app X worked as badly in Wine as in w7 :-( whereas it used to work fine on my w98/xp machine". Actually, there are quite a few AppDB comments like the first one. One reason might be that the dlls those app use were added to Wine at a time where the target OS was w9x or xp, whereas if they were written now, targeting w7, the old app would not work in Wine either. A related topic is: we have no idea what the "set compatibility for wXY" checkbox in w7 does. Recently, I discovered that "Age of Empires II - Conquerors" only plays videos on a w7 machine when you set w7 to xp compatibility. Why? The rest of the app seems to work (except for the purple grass issue, which requires a particular DirectDraw compatibility registry entry in w7). Did AoE target w7 when it was written? Obviously not. Regards, Jörg Höhle

March 30, 2012

Re: gdi32: Add support for loading scalable font resources.

by Dmitry Timoshkov

Huw Davies <huw(a)codeweavers.com> wrote: > + if (size.u.LowPart < sizeof( *dos )) goto fail; Testing LowPart only could not work for large sizes. -- Dmitry.

March 30, 2012

Re: [PATCH 2/3] dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17568 Your paranoid android. === WNT4WSSP6 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2KPROSP4 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80004002 dmsynth.c:42: Test failed: CoCreateInstance returned: 80004002 === W2K3R2SESP2 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2K8SE (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154

March 29, 2012

Re: [PATCH 1/3] dmsynth: Add basic tests.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17567 Your paranoid android. === WNT4WSSP6 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2KPROSP4 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80004002 dmsynth.c:42: Test failed: CoCreateInstance returned: 80004002 === W2K3R2SESP2 (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154 === W2K8SE (32 bit dmsynth) === dmsynth.c:39: Test failed: CoCreateInstance returned: 80040154 dmsynth.c:42: Test failed: CoCreateInstance returned: 80040154

March 29, 2012

Re: [PATCH 3/3] d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.

by Christian Costa

Le 30/03/2012 00:28, Michael Stefaniuc a écrit : > Hello Christian, > > On 03/29/2012 11:57 PM, Christian Costa wrote: >> +HRESULT Direct3DRMMesh_create(REFIID riid, IUnknown** ppObj) >> +{ >> + IDirect3DRMMeshImpl* object; >> + >> + TRACE("(%p)\n", ppObj); >> + >> + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); >> + if (!object) >> + { >> + ERR("Out of memory\n"); >> + return E_OUTOFMEMORY; >> + } >> + >> + object->IDirect3DRMMesh_iface.lpVtbl =&Direct3DRMMesh_Vtbl; >> + object->ref = 1; >> + >> + if (IsEqualGUID(riid,&IID_IDirect3DRMMesh)) >> + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; >> + else >> + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; > both if and else code path are the same. > >> + >> + return S_OK; >> +} >> + > bye > michael > Thanks Michael. Something was wrong. I resent a cleaner patch. Bye Christian

March 29, 2012

Re: [PATCH 3/3] d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.

by Michael Stefaniuc

Hello Christian, On 03/29/2012 11:57 PM, Christian Costa wrote: > +HRESULT Direct3DRMMesh_create(REFIID riid, IUnknown** ppObj) > +{ > + IDirect3DRMMeshImpl* object; > + > + TRACE("(%p)\n", ppObj); > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); > + if (!object) > + { > + ERR("Out of memory\n"); > + return E_OUTOFMEMORY; > + } > + > + object->IDirect3DRMMesh_iface.lpVtbl = &Direct3DRMMesh_Vtbl; > + object->ref = 1; > + > + if (IsEqualGUID(riid, &IID_IDirect3DRMMesh)) > + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; > + else > + *ppObj = (IUnknown*)&object->IDirect3DRMMesh_iface; both if and else code path are the same. > + > + return S_OK; > +} > + bye michael

March 29, 2012