vbscript: Ignore version flags in GetDispID.
This commit is contained in:
parent
3e5c76bd09
commit
edab5d85c7
@ -333,6 +333,11 @@ static void test_disp(IDispatch *disp)
|
|||||||
ok(id == -1, "id = %d\n", id);
|
ok(id == -1, "id = %d\n", id);
|
||||||
SysFreeString(str);
|
SysFreeString(str);
|
||||||
|
|
||||||
|
str = a2bstr("publicProp");
|
||||||
|
hres = IDispatchEx_GetDispID(dispex, str, 0x80000000|fdexNameCaseInsensitive, &public_prop_id);
|
||||||
|
SysFreeString(str);
|
||||||
|
ok(hres == S_OK, "GetDispID(publicProp) failed: %08x\n", hres);
|
||||||
|
|
||||||
IDispatchEx_Release(dispex);
|
IDispatchEx_Release(dispex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,8 @@
|
|||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
|
WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
|
||||||
|
|
||||||
|
#define FDEX_VERSION_MASK 0xf0000000
|
||||||
|
|
||||||
static inline BOOL is_func_id(vbdisp_t *This, DISPID id)
|
static inline BOOL is_func_id(vbdisp_t *This, DISPID id)
|
||||||
{
|
{
|
||||||
return id < This->desc->func_cnt;
|
return id < This->desc->func_cnt;
|
||||||
@ -326,6 +328,8 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
|
|||||||
|
|
||||||
TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
|
TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
|
||||||
|
|
||||||
|
grfdex &= ~FDEX_VERSION_MASK;
|
||||||
|
|
||||||
if(!This->desc)
|
if(!This->desc)
|
||||||
return E_UNEXPECTED;
|
return E_UNEXPECTED;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user