December 2019 - Wine-commits

Zebediah Figura : qedit/samplegrabber: Fix a typo in format type negotiation.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 445f1a69297fafa5242a1133fcc02c0b126e5e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445f1a69297fafa5242a1133… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:16 2019 -0600 qedit/samplegrabber: Fix a typo in format type negotiation. Fixes a regression introduced by 2c8e152ff06ae3e460276401b4b6bdaa1ffc676d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 87e30c5608..edb814468a 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -593,7 +593,7 @@ static HRESULT WINAPI sample_grabber_source_AttemptConnection(struct strmbase_so return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL) - && !IsEqualGUID(&mt->formattype, &filter->mtype.majortype)) + && !IsEqualGUID(&mt->formattype, &filter->mtype.formattype)) return VFW_E_TYPE_NOT_ACCEPTED; if (!IsEqualGUID(&mt->formattype, &FORMAT_None) && !IsEqualGUID(&mt->formattype, &GUID_NULL)

1 0

Francois Gouget : testbot/LogUtils: Fix the ParseTaskLog() Perl documentation formatting.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: tools Branch: master Commit: 214d59e531fa00f6c3d37510f3241f16d013f415 URL: https://source.winehq.org/git/tools.git/?a=commit;h=214d59e531fa00f6c3d3751… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 13 00:37:17 2019 +0100 testbot/LogUtils: Fix the ParseTaskLog() Perl documentation formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4a17857..17a0286 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -81,6 +81,7 @@ Either 'ok' if the task was successful or a code indicating why it failed. =item NoLog Contains an error message if the task log could not be read. +=back =back =cut

1 0

Alexandre Julliard : Wine release 5.0-rc1
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: website Branch: master Commit: c5a937c85c16215e8d556d1b368451766ebf8c3a URL: https://source.winehq.org/git/website.git/?a=commit;h=c5a937c85c16215e8d556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 22:27:40 2019 +0100 Wine release 5.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019121301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2019121301.xml b/news/en/2019121301.xml new file mode 100644 index 00000000..6cd34b5b --- /dev/null +++ b/news/en/2019121301.xml @@ -0,0 +1,19 @@ +<news> +<date>December 13, 2019</date> +<title>Wine 5.0-rc1 Released</title> +<body> + The Wine development release 5.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 5.0. It marks the beginning of the yearly code freeze period. Please give this release a good testing to help us make 5.0 as good as possible. + <a href="{$root}/announce/5.0-rc1">What's new</a> in this release: +<ul> + <li>Gecko update, with support for running from a global location.</li> + <li>Unicode data updated to Unicode version 12.1.</li> + <li>Initial version of the MSADO (ActiveX Data Objects) library.</li> + <li>Update installation support in the WUSA (Windows Update Standalone) tool.</li> + <li>More progress on the kernel32/kernelbase restructuring.</li> + <li>Support for signing with ECDSA keys.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Damjan Jovanovic : gdiplus: Start implementing CompositingModeSourceCopy.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: a16a4d97570613a8139a9a06164032324438367b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16a4d97570613a8139a9a06… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Dec 13 05:16:53 2019 +0200 gdiplus: Start implementing CompositingModeSourceCopy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 22 +++++++++++++++------- dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c83278a4b..e0a013896f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -372,6 +372,9 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; + CompositingMode comp_mode; + + GdipGetCompositingMode(graphics, &comp_mode); for (y=0; y<src_height; y++) { @@ -380,14 +383,19 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ ARGB dst_color, src_color; src_color = ((ARGB*)(src + src_stride * y))[x]; - if (!(src_color & 0xff000000)) - continue; - - GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); - if (fmt & PixelFormatPAlpha) - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over_fgpremult(dst_color, src_color)); + if (comp_mode == CompositingModeSourceCopy) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, src_color); else - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + { + if (!(src_color & 0xff000000)) + continue; + + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + if (fmt & PixelFormatPAlpha) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over_fgpremult(dst_color, src_color)); + else + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + } } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 60591b0aca..74c471e9ac 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4205,9 +4205,9 @@ static void test_DrawImage_SourceCopy(void) status = GdipDrawImageI(graphics, u2.image, 0, 0); expect(Ok, status); - todo_wine expect(0, dst_pixels[0]); + expect(0, dst_pixels[0]); expect(0xffff0000, dst_pixels[1]); - todo_wine expect(0, dst_pixels[2]); + expect(0, dst_pixels[2]); todo_wine expect(0, dst_pixels[3]); status = GdipDeleteGraphics(graphics);

1 0

Damjan Jovanovic : gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 3c8784bf9c1a897de021587437c5ec4f648c84a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c8784bf9c1a897de0215874… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Dec 13 05:17:54 2019 +0200 gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend. All sample code in the Python Pyglet library suffers from terrible text corruption, caused by the inability to erase the background between rendering sequential font glyphs, resulting in leftovers from previous letters mixing with the image of new letters. This is because it attempts to erase the background by calling GdipGraphicsClear() with ARGB color 0x00000000 (completely transparent black), and in our gdiplus alpha blending that into the background has no effect. It should be using CompositeModeSourceCopy to overwrite the background with that brush instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/tests/image.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e0a013896f..e485e5c99f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4949,6 +4949,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) GpSolidFill *brush; GpStatus stat; GpRectF wnd_rect; + CompositingMode prev_comp_mode; TRACE("(%p, %x)\n", graphics, color); @@ -4969,8 +4970,11 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) return stat; } + GdipGetCompositingMode(graphics, &prev_comp_mode); + GdipSetCompositingMode(graphics, CompositingModeSourceCopy); GdipFillRectangle(graphics, (GpBrush*)brush, wnd_rect.X, wnd_rect.Y, wnd_rect.Width, wnd_rect.Height); + GdipSetCompositingMode(graphics, prev_comp_mode); GdipDeleteBrush((GpBrush*)brush); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 74c471e9ac..62cd79fec6 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5485,6 +5485,48 @@ todo_wine HeapFree(GetProcessHeap(), 0, data); } +static void test_graphics_clear(void) +{ + BYTE argb[8] = { 0x11,0x22,0x33,0x80, 0xff,0xff,0xff,0 }; + BYTE cleared[8] = { 0,0,0,0, 0,0,0,0 }; + BYTE *bits; + GpBitmap *bitmap; + GpGraphics *graphics; + BitmapData data; + GpStatus status; + int match; + + status = GdipCreateBitmapFromScan0(2, 1, 8, PixelFormat32bppARGB, argb, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGraphicsClear(graphics, 0x00000000); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppARGB, "expected PixelFormat32bppARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, cleared, sizeof(cleared)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppPARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5560,6 +5602,7 @@ START_TEST(image) test_histogram(); test_imageabort(); test_GdipLoadImageFromStream(); + test_graphics_clear(); GdiplusShutdown(gdiplusToken); }

1 0

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetNames.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 7be12525aa4125463b20e4752c59b3ec2ecc0725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be12525aa4125463b20e475… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:45 2019 +0200 jscript: Implement ScriptTypeInfo_GetNames. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6cc6df58e1..9e33737426 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -625,6 +625,44 @@ typedef struct { jsdisp_t *jsdisp; } ScriptTypeInfo; +static struct typeinfo_func *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID func_memid = prop_to_id(typeinfo->jsdisp, typeinfo->funcs[i].prop); + + if (memid == func_memid) + return &typeinfo->funcs[i]; + else if (memid < func_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + +static dispex_prop_t *get_var_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_vars; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID var_memid = prop_to_id(typeinfo->jsdisp, typeinfo->vars[i]); + + if (memid == var_memid) + return typeinfo->vars[i]; + else if (memid < var_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -786,10 +824,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + struct typeinfo_func *func; + ITypeInfo *disp_typeinfo; + dispex_prop_t *var; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func) + { + var = get_var_from_memid(This, memid); + if (!var) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + rgBstrNames[0] = SysAllocString(func ? func->prop->name : var->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + + if (func) + { + unsigned num = min(cMaxNames, func->code->param_cnt + 1); + + for (; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->code->params[i - 1]))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType)

1 0

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetRefTypeOfImplType.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 2990bc3515362a5c346d89fbbbe386eb9b0d0c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2990bc3515362a5c346d89fb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:46 2019 +0200 jscript: Implement ScriptTypeInfo_GetRefTypeOfImplType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 9e33737426..f132e2eac7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -877,9 +877,14 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%u %p)\n", This, index, pRefType); + TRACE("(%p)->(%u %p)\n", This, index, pRefType); - return E_NOTIMPL; + /* We only inherit from IDispatch */ + if (!pRefType) return E_INVALIDARG; + if (index != 0) return TYPE_E_ELEMENTNOTFOUND; + + *pRefType = 1; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags)

1 0

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetRefTypeInfo.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: f6197e745431f76620a7bab6f6a92fafeeff15fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6197e745431f76620a7bab6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:47 2019 +0200 jscript: Implement ScriptTypeInfo_GetRefTypeInfo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f132e2eac7..63c1edb082 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -983,10 +983,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + HRESULT hr; - FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo); - return E_NOTIMPL; + if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG; + + if (hRefType & ~3) return E_FAIL; + if (hRefType & 1) + { + hr = get_dispatch_typeinfo(ppTInfo); + if (FAILED(hr)) return hr; + } + else + *ppTInfo = iface; + + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)

1 0

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetImplTypeFlags.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: d9a560b1cebed8354283c362f4921f168508bdd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a560b1cebed8354283c362… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:48 2019 +0200 jscript: Implement ScriptTypeInfo_GetImplTypeFlags. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 63c1edb082..acfe00f7df 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -891,9 +891,13 @@ static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT ind { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + TRACE("(%p)->(%u %p)\n", This, index, pImplTypeFlags); - return E_NOTIMPL; + if (!pImplTypeFlags) return E_INVALIDARG; + if (index != 0) return TYPE_E_ELEMENTNOTFOUND; + + *pImplTypeFlags = 0; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames,

1 0

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_Invoke.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 35521e9e07b1d83c407999eae7aa53425b9f101f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35521e9e07b1d83c407999ea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:49 2019 +0200 jscript: Implement ScriptTypeInfo_Invoke. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index acfe00f7df..6f13c6b534 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -957,11 +957,33 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + IDispatch *disp; + HRESULT hr; - FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + if (!pvInstance) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + if (!get_func_from_memid(This, memid) && !get_var_from_memid(This, memid)) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_Invoke(disp_typeinfo, pvInstance, memid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + } + + hr = IUnknown_QueryInterface((IUnknown*)pvInstance, &IID_IDispatch, (void**)&disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_Invoke(disp, memid, &IID_NULL, LOCALE_USER_DEFAULT, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + IDispatch_Release(disp); + + return hr; } static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName,

1 0