May 2012 - Wine-commits - list.winehq.org

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroupCount.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 5a979deeb338b0bf250aae51cfb308f0c242c1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a979deeb338b0bf250aae51c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 21 09:42:57 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupCount. --- dlls/d3drm/meshbuilder.c | 4 ++-- dlls/d3drm/tests/d3drm.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bbe927d..4333516 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2508,9 +2508,9 @@ static DWORD WINAPI IDirect3DRMMeshImpl_GetGroupCount(IDirect3DRMMesh* iface) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return 0; + return This->nb_groups; } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroup(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 76cb790..ffe571a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -172,6 +172,7 @@ static void test_MeshBuilder(void) HRESULT hr; LPDIRECT3DRM pD3DRM; LPDIRECT3DRMMESHBUILDER pMeshBuilder; + LPDIRECT3DRMMESH mesh; D3DRMLOADMEMORY info; int val; DWORD val1, val2, val3; @@ -282,6 +283,19 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + /* No group in mesh when mesh builder is not loaded */ + hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups); + + IDirect3DRMMesh_Release(mesh); + } + info.lpMemory = data_full; info.dSize = strlen(data_full); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -325,6 +339,18 @@ static void test_MeshBuilder(void) ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]); ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]); + hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); + + IDirect3DRMMesh_Release(mesh); + } + hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4); ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr);

1 0

Vincent Povirk : appwiz.cpl: Add Wine Mono to addons.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8ea086b30802fd668f0580dec99a636a8b457198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea086b30802fd668f0580dec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 21 07:46:03 2012 -0500 appwiz.cpl: Add Wine Mono to addons. --- dlls/appwiz.cpl/addons.c | 11 +++++++ dlls/appwiz.cpl/appwiz.c | 6 ++++ dlls/appwiz.cpl/appwiz.h | 3 +- dlls/appwiz.cpl/appwiz.rc | 15 ++++++++++ dlls/appwiz.cpl/res.h | 1 + po/ar.po | 50 +++++++++++++++++++++------------ po/bg.po | 57 +++++++++++++++++++++++++------------ po/ca.po | 68 +++++++++++++++++++++++++++++++++------------ po/cs.po | 68 +++++++++++++++++++++++++++++++++------------ po/da.po | 67 ++++++++++++++++++++++++++++++++------------ po/de.po | 68 +++++++++++++++++++++++++++++++++------------ po/el.po | 50 +++++++++++++++++++++------------ po/en.po | 56 +++++++++++++++++++++++++------------ po/en_US.po | 56 +++++++++++++++++++++++++------------ po/eo.po | 52 ++++++++++++++++++++++------------ po/es.po | 67 ++++++++++++++++++++++++++++++++------------ po/fa.po | 50 +++++++++++++++++++++------------ po/fi.po | 67 ++++++++++++++++++++++++++++++++------------ po/fr.po | 68 +++++++++++++++++++++++++++++++++------------ po/he.po | 58 ++++++++++++++++++++++++++------------ po/hi.po | 50 +++++++++++++++++++++------------ po/hu.po | 68 +++++++++++++++++++++++++++++++++------------ po/it.po | 68 +++++++++++++++++++++++++++++++++------------ po/ja.po | 68 +++++++++++++++++++++++++++++++++------------ po/ko.po | 68 +++++++++++++++++++++++++++++++++------------ po/lt.po | 66 +++++++++++++++++++++++++++++++------------ po/ml.po | 50 +++++++++++++++++++++------------ po/nb_NO.po | 59 +++++++++++++++++++++++++++------------ po/nl.po | 67 ++++++++++++++++++++++++++++++++------------ po/or.po | 50 +++++++++++++++++++++------------ po/pa.po | 50 +++++++++++++++++++++------------ po/pl.po | 68 +++++++++++++++++++++++++++++++++------------ po/pt_BR.po | 68 +++++++++++++++++++++++++++++++++------------ po/pt_PT.po | 68 +++++++++++++++++++++++++++++++++------------ po/rm.po | 50 +++++++++++++++++++++------------ po/ro.po | 52 ++++++++++++++++++++++------------ po/ru.po | 68 +++++++++++++++++++++++++++++++++------------ po/sk.po | 68 +++++++++++++++++++++++++++++++++------------ po/sl.po | 68 +++++++++++++++++++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 59 +++++++++++++++++++++++++++------------ po/sr_RS(a)latin.po | 59 +++++++++++++++++++++++++++------------ po/sv.po | 68 +++++++++++++++++++++++++++++++++------------ po/te.po | 50 +++++++++++++++++++++------------ po/th.po | 50 +++++++++++++++++++++------------ po/tr.po | 52 ++++++++++++++++++++++------------ po/uk.po | 68 +++++++++++++++++++++++++++++++++------------ po/wa.po | 50 +++++++++++++++++++++------------ po/wine.pot | 50 +++++++++++++++++++++------------ po/zh_CN.po | 65 +++++++++++++++++++++++++++++++------------ po/zh_TW.po | 66 +++++++++++++++++++++++++++++++------------ tools/wine.inf.in | 2 + 51 files changed, 1940 insertions(+), 811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea086b30802fd668f058…

1 0

Henri Verbeet : wined3d: Move the resource map count field up to wined3d_resource.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: f2fb3f11f935e4feaf4d6109a56c82eda8b3ec60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fb3f11f935e4feaf4d6109a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 20:48:33 2012 +0200 wined3d: Move the resource map count field up to wined3d_resource. --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0ee814b..aaa50d7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,7 +1008,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (!buffer_add_dirty_area(buffer, offset, size)) return E_OUTOFMEMORY; } - count = InterlockedIncrement(&buffer->lock_count); + count = ++buffer->resource.map_count; if (buffer->buffer_object) { @@ -1121,13 +1121,13 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) * number of Map calls, d3d returns always D3D_OK. * This is also needed to prevent Map from returning garbage on * the next call (this will happen if the lock_count is < 0). */ - if (!buffer->lock_count) + if (!buffer->resource.map_count) { WARN("Unmap called without a previous map call.\n"); return; } - if (InterlockedDecrement(&buffer->lock_count)) + if (--buffer->resource.map_count) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unmap.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a78b65..6dad53d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1838,6 +1838,7 @@ struct wined3d_resource { LONG ref; LONG bind_count; + LONG map_count; struct wined3d_device *device; enum wined3d_resource_type type; const struct wined3d_format *format; @@ -2410,7 +2411,6 @@ struct wined3d_buffer UINT buffer_object_size; DWORD flags; - LONG lock_count; struct wined3d_map_range *maps; ULONG maps_size, modified_areas; struct wined3d_event_query *query;

1 0

Eric Pouech : dbghelp: Protect COFF line number parsing against out of bounds access.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: dbd70d09176129b5f76c921e1c6c1e18075319c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd70d09176129b5f76c921e1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 20 09:43:52 2012 +0200 dbghelp: Protect COFF line number parsing against out of bounds access. --- dlls/dbghelp/coff.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 54bd278..9f01fd2 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -424,26 +424,26 @@ DECLSPEC_HIDDEN BOOL coff_process_info(const struct msc_debug_info* msc_dbg) * If we have spilled onto the next entrypoint, then * bump the counter.. */ - for (;;) + for (; l+1 < coff_files.files[j].neps; l++) { - if (l+1 >= coff_files.files[j].neps) break; - symt_get_address(coff_files.files[j].entries[l+1], &addr); - if (((msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress) < addr)) + if (symt_get_address(coff_files.files[j].entries[l+1], &addr) && + msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress < addr) + { + if (coff_files.files[j].entries[l+1]->tag == SymTagFunction) + { + /* + * Add the line number. This is always relative to the + * start of the function, so we need to subtract that offset + * first. + */ + symt_add_func_line(msc_dbg->module, + (struct symt_function*)coff_files.files[j].entries[l+1], + coff_files.files[j].compiland->source, + linepnt->Linenumber, + msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress - addr); + } break; - l++; - } - - if (coff_files.files[j].entries[l+1]->tag == SymTagFunction) - { - /* - * Add the line number. This is always relative to the - * start of the function, so we need to subtract that offset - * first. - */ - symt_get_address(coff_files.files[j].entries[l+1], &addr); - symt_add_func_line(msc_dbg->module, (struct symt_function*)coff_files.files[j].entries[l+1], - coff_files.files[j].compiland->source, linepnt->Linenumber, - msc_dbg->module->module.BaseOfImage + linepnt->Type.VirtualAddress - addr); + } } } }

1 0

Eric Pouech : winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones).
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8308c35ec5e67f9c51eb41ce6b80abd7986ae56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8308c35ec5e67f9c51eb41ce6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 20 09:45:26 2012 +0200 winedbg: In the gdb remote protocol implementation, correctly manage the size of registers on the wire (esp. for 64bit ones). --- programs/winedbg/gdbproxy.c | 436 ++++++++++++++++++++++++------------------- 1 files changed, 247 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8308c35ec5e67f9c51eb4…

1 0

Francois Gouget : d3drm: Make load_data() static.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 2b89bc528cca8054effcf7dba9de11e4511d297a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b89bc528cca8054effcf7dba… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 17:51:37 2012 +0200 d3drm: Make load_data() static. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index f13effc..31edd46 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1255,7 +1255,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_EnumerateObjects(IDirect3DRM3* iface, D3D return E_NOTIMPL; } -HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, +static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPIID* GUIDs, DWORD nb_GUIDs, D3DRMLOADCALLBACK LoadProc, LPVOID ArgLP, D3DRMLOADTEXTURECALLBACK LoadTextureProc, LPVOID ArgLTP, LPDIRECT3DRMFRAME3 parent_frame) { HRESULT ret = D3DRMERR_BADOBJECT;

1 0

Francois Gouget : secur32: Make some SecurityFunction methods static.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 71945b76356c4772bd2d8012477755b22714aa1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71945b76356c4772bd2d80124… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 17:51:53 2012 +0200 secur32: Make some SecurityFunction methods static. --- dlls/secur32/negotiate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index ac48a77..bf16258 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -407,7 +407,7 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, /*********************************************************************** * FreeCredentialsHandle */ -SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) +static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { TRACE("%p\n", phCredential); @@ -417,7 +417,7 @@ SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) /*********************************************************************** * EncryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); @@ -428,7 +428,7 @@ SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, /*********************************************************************** * DecryptMessage */ -SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, +static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP);

1 0

Francois Gouget : quartz/tests: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 0f504a17ced3bd7a481f5b1f217796d04c3cb60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f504a17ced3bd7a481f5b1f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 18:01:52 2012 +0200 quartz/tests: Fix compilation on systems that don't support nameless structs. --- dlls/quartz/tests/filtergraph.c | 6 +++--- dlls/quartz/tests/filtermapper.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 967a4ac..ea37b2f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1798,8 +1798,8 @@ static void test_render_filter_priority(void) rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; rgPins2[0].nMediaTypes = 1; @@ -1825,7 +1825,7 @@ static void test_render_filter_priority(void) &CLSID_LegacyAmFilterCategory, NULL, &rgf2); ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; rgPins2[0].dwFlags = 0; rgPinType[0].clsMinorType = &mediasubtype1; diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 68918f2..b52d17e 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -104,8 +104,8 @@ static void test_fm2_enummatchingfilters(void) /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -136,7 +136,7 @@ static void test_fm2_enummatchingfilters(void) rgPins2[1].lpMedium = NULL; rgPins2[1].clsPinCategory = NULL; - S1(U(rgf2)).cPins2 = 2; + S2(U(rgf2)).cPins2 = 2; hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); @@ -418,8 +418,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S(U(rgf2)).cPins = 1; - S(U(rgf2)).rgPins = &rgPins; + S1(U(rgf2)).cPins = 1; + S1(U(rgf2)).rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -447,8 +447,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = &rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1;

1 0

Dmitry Timoshkov : gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: a4f79c347e1aa55516d0e8f3916f68b25483ed75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f79c347e1aa55516d0e8f39… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 21 14:40:53 2012 +0900 gdiplus: Use font emSize to map to pixel size instead of using gdi32 font metrics. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 70ddef6..51733f4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -483,7 +483,7 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { /* FIXME: use graphics */ - lf->lfHeight = -font->otm.otmTextMetrics.tmAscent; + lf->lfHeight = -em_size_to_pixel(font->emSize, font->unit, font->family->dpi); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0;

1 0

Michael Stefaniuc : jscript/tests: Check the correct return value.
by Alexandre Julliard 21 May '12

21 May '12

Module: wine Branch: master Commit: 8f4512f76324e27e8f84f82ecf4565860dfe6c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4512f76324e27e8f84f82ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 10:02:02 2012 +0200 jscript/tests: Check the correct return value. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 0ffb2a5..cdd29b6 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -255,7 +255,7 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) hres = IActiveScript_GetScriptDispatch(script, NULL, &disp); ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); - IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); IDispatch_Release(disp); ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); return dispex;

1 0