December 2019 - Wine-Commits

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 4273b29c8e8ab5e4c233bb55c66d0522a969d653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4273b29c8e8ab5e4c233bb55… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 9 22:28:01 2019 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 446 ++++++++++++++++----------------------------------------------- 1 file changed, 111 insertions(+), 335 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4273b29c8e8ab5e4c233…

1 0

Biswapriyo Nath : include: Update d3d9caps.h header file.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 7157160865874344c330c936697942d2e8bca2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7157160865874344c330c936… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Dec 11 07:18:00 2019 +0530 include: Update d3d9caps.h header file. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index feee0d4ce5..1068a2c35a 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -407,6 +407,49 @@ typedef struct _D3DCAPS9 { } D3DCAPS9; +#ifndef D3D_DISABLE_9EX + +#define D3DOVERLAYCAPS_FULLRANGERGB 0x00000001 +#define D3DOVERLAYCAPS_LIMITEDRANGERGB 0x00000002 +#define D3DOVERLAYCAPS_YCbCr_BT601 0x00000004 +#define D3DOVERLAYCAPS_YCbCr_BT709 0x00000008 +#define D3DOVERLAYCAPS_YCbCr_BT601_xvYCC 0x00000010 +#define D3DOVERLAYCAPS_YCbCr_BT709_xvYCC 0x00000020 +#define D3DOVERLAYCAPS_STRETCHX 0x00000040 +#define D3DOVERLAYCAPS_STRETCHY 0x00000080 + +typedef struct _D3DOVERLAYCAPS { + UINT Caps; + UINT MaxOverlayDisplayWidth; + UINT MaxOverlayDisplayHeight; +} D3DOVERLAYCAPS; + +#define D3DCPCAPS_SOFTWARE 0x00000001 +#define D3DCPCAPS_HARDWARE 0x00000002 +#define D3DCPCAPS_PROTECTIONALWAYSON 0x00000004 +#define D3DCPCAPS_PARTIALDECRYPTION 0x00000008 +#define D3DCPCAPS_CONTENTKEY 0x00000010 +#define D3DCPCAPS_FRESHENSESSIONKEY 0x00000020 +#define D3DCPCAPS_ENCRYPTEDREADBACK 0x00000040 +#define D3DCPCAPS_ENCRYPTEDREADBACKKEY 0x00000080 +#define D3DCPCAPS_SEQUENTIAL_CTR_IV 0x00000100 +#define D3DCPCAPS_ENCRYPTSLICEDATAONLY 0x00000200 + +typedef struct _D3DCONTENTPROTECTIONCAPS { + DWORD Caps; + GUID KeyExchangeType; + UINT BufferAlignmentStart; + UINT BlockAlignmentSize; + ULONGLONG ProtectedMemorySize; +} D3DCONTENTPROTECTIONCAPS; + +DEFINE_GUID(D3DCRYPTOTYPE_AES128_CTR, 0x9b6bd711, 0x4f74, 0x41c9, 0x9e, 0x7b, 0xb, 0xe2, 0xd7, 0xd9, 0x3b, 0x4f); +DEFINE_GUID(D3DCRYPTOTYPE_PROPRIETARY, 0xab4e9afd, 0x1d1c, 0x46e6, 0xa7, 0x2f, 0x8, 0x69, 0x91, 0x7b, 0xd, 0xe8); +DEFINE_GUID(D3DKEYEXCHANGE_RSAES_OAEP, 0xc1949895, 0xd72a, 0x4a1d, 0x8e, 0x5d, 0xed, 0x85, 0x7d, 0x17, 0x15, 0x20); +DEFINE_GUID(D3DKEYEXCHANGE_DXVA, 0x43d3775c, 0x38e5, 0x4924, 0x8d, 0x86, 0xd3, 0xfc, 0xcf, 0x15, 0x3e, 0x9b); + +#endif + #ifdef __i386__ #include <poppack.h> #endif

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetImplTypeFlags.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 09b9da5bba85315be5c5044bda2a6a96e0acd79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b9da5bba85315be5c5044b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:27 2019 +0100 vbscript: 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/vbscript/vbdisp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b01335b3bf..00c48e0b48 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -794,9 +794,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 : vbscript: Implement ScriptTypeInfo_CreateInstance.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 16ccc06d227f0a2391a8bb61ecf0d2d0f965bc41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ccc06d227f0a2391a8bb61… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:20:01 2019 +0100 vbscript: Implement ScriptTypeInfo_CreateInstance. 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/vbscript/vbdisp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 319867b0ea..55307d127c 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1003,9 +1003,12 @@ static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown * { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + TRACE("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); - return E_NOTIMPL; + if (!ppvObj) return E_INVALIDARG; + + *ppvObj = NULL; + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops)

1 0

Michael Stefaniuc : mountmgr.sys: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 269f29f3c01b15f693bf350d9dcdb00f8bfad1e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=269f29f3c01b15f693bf350d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 11 20:30:14 2019 +0100 mountmgr.sys: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 3369a92922..0ca2d42517 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -704,19 +704,19 @@ static HKEY get_scsi_device_lun_key( SCSI_ADDRESS *scsi_addr ) if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return NULL; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_port_keyW, scsi_addr->PortNumber ); if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return NULL; RegCloseKey( scsi_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_bus_keyW, scsi_addr->PathId ); if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return NULL; RegCloseKey( port_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), target_id_keyW, scsi_addr->TargetId ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return NULL; RegCloseKey( bus_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + snprintfW( dataW, ARRAY_SIZE( dataW ), lun_keyW, scsi_addr->Lun ); if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return NULL; RegCloseKey( target_key ); @@ -746,7 +746,7 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, scsi_keyW, 0, KEY_READ|KEY_WRITE, &scsi_key )) return; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_port_keyW, scsi_addr->PortNumber ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_port_keyW, scsi_addr->PortNumber ); if (RegCreateKeyExW( scsi_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &port_key, NULL )) return; RegCloseKey( scsi_key ); @@ -757,19 +757,19 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive value = 0; - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), scsi_bus_keyW, scsi_addr->PathId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), scsi_bus_keyW, scsi_addr->PathId ); if (RegCreateKeyExW( port_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &bus_key, NULL )) return; RegCloseKey( port_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), init_id_keyW, init_id ); + snprintfW( dataW, ARRAY_SIZE( dataW ), init_id_keyW, init_id ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; RegCloseKey( target_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), target_id_keyW, scsi_addr->TargetId ); + snprintfW( dataW, ARRAY_SIZE( dataW ), target_id_keyW, scsi_addr->TargetId ); if (RegCreateKeyExW( bus_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &target_key, NULL )) return; RegCloseKey( bus_key ); - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), lun_keyW, scsi_addr->Lun ); + snprintfW( dataW, ARRAY_SIZE( dataW ), lun_keyW, scsi_addr->Lun ); if (RegCreateKeyExW( target_key, dataW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &lun_key, NULL )) return; RegCloseKey( target_key ); @@ -811,7 +811,7 @@ void create_scsi_entry( SCSI_ADDRESS *scsi_addr, UINT init_id, const char *drive } else if (type == SCSI_TAPE_PERIPHERAL) { - snprintfW( dataW, sizeof(dataW)/sizeof(*dataW), tapeW, tape_no++ ); + snprintfW( dataW, ARRAY_SIZE( dataW ), tapeW, tape_no++ ); RegSetValueExW( lun_key, devnameW, 0, REG_SZ, (const BYTE *)dataW, strlenW( dataW ) ); }

1 0

Michael Stefaniuc : winetest: Remove superfluous cast to self.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 8576d5ad84f6360896858998bd6ba697e8c218a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8576d5ad84f6360896858998… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 11 20:30:15 2019 +0100 winetest: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 60cb49d139..9d6a318e9c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -202,7 +202,7 @@ static BOOL running_on_visible_desktop (void) HWINSTA wstation; USEROBJECTFLAGS uoflags; - wstation = (HWINSTA)pGetProcessWindowStation(); + wstation = pGetProcessWindowStation(); assert(pGetUserObjectInformationA(wstation, UOI_FLAGS, &uoflags, sizeof(uoflags), &len)); return (uoflags.dwFlags & WSF_VISIBLE) != 0; }

1 0

Bernat Arlandis : dinput: Log effect directions, and use effective flags.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 5d07cdf54f576cf0c235ea6ba90756c849f5ac60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d07cdf54f576cf0c235ea6b… Author: Bernat Arlandis <berarma(a)hotmail.com> Date: Wed Dec 11 09:28:26 2019 -0600 dinput: Log effect directions, and use effective flags. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 4 ++-- dlls/dinput/joystick.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 4b2f317ce3..cc2df3ce87 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -489,8 +489,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - dump_DIEFFECT(peff, &This->guid, dwFlags); - if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */ dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | @@ -498,6 +496,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS; } + dump_DIEFFECT(peff, &This->guid, dwFlags); + if (dwFlags & DIEP_AXES) { /* the linux input effect system only supports one or two axes */ if (peff->cAxes > 2) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 2220b5d576..01611b0e44 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,6 +207,12 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); + if (dwFlags & DIEP_DIRECTION) { + TRACE(" "); + for (i = 0; i < eff->cAxes; ++i) + TRACE("%d ", eff->rglDirection[i]); + TRACE("\n"); + } TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams);

1 0

Gabriel Ivăncescu : vbscript/tests: Add more tests for the script TypeInfo.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: a79bde85916043412a3d2928397095831ebe69b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a79bde85916043412a3d2928… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:20:15 2019 +0100 vbscript/tests: Add more tests for the script TypeInfo. 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/vbscript/tests/vbscript.c | 126 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a79bde85916043412a3d…

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetMops.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 4bca2a33c74a62c1b9aab22d30c8c00dcb4cce1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bca2a33c74a62c1b9aab22d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:20:07 2019 +0100 vbscript: Implement ScriptTypeInfo_GetMops. 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/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 55307d127c..c14cd7b4c7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1014,10 +1014,23 @@ static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown * static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + TRACE("(%p)->(%d %p)\n", This, memid, pBstrMops); - return E_NOTIMPL; + if (!pBstrMops) return E_INVALIDARG; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetMops(disp_typeinfo, memid, pBstrMops); + } + + *pBstrMops = NULL; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDllEntry.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 5376e792c5e5f1e7b22e935fc53c1adb22ebda37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5376e792c5e5f1e7b22e935f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:49 2019 +0100 vbscript: Implement ScriptTypeInfo_GetDllEntry. 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/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 94c68733cc..edf7739a5d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -937,10 +937,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); - return E_NOTIMPL; + if (pBstrDllName) *pBstrDllName = NULL; + if (pBstrName) *pBstrName = NULL; + if (pwOrdinal) *pwOrdinal = 0; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetDllEntry(disp_typeinfo, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + } + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo)

1 0