April 2021 - Wine-devel - list.winehq.org

[PATCH 1/9] jscript: Add Map object stub implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.c | 5 ++ dlls/jscript/jscript.h | 2 + dlls/jscript/object.c | 1 + dlls/jscript/set.c | 120 ++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 24 ++++++ 5 files changed, 152 insertions(+)

2 1

[PATCH 8/9] jscript: Add Map.prototype.forEach implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)

1 0

[PATCH 7/9] jscript: Add Map.size property implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 6/9] jscript: Add Map.prototype.has implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 5/9] jscript: Add Map.prototype.delete implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 4/9] jscript: Add Map.prototype.clear implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH 3/9] jscript: Add Map.prototype.get implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 2/9] jscript: Add Map.prototype.set implementation.
by Jacek Caban 27 Apr '21

27 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/set.c | 142 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 142 insertions(+), 3 deletions(-)

1 0

[PATCH v2 1/3] user32: Move ToUnicodeEx from wineandroid.drv to user32.
by Rémi Bernon 27 Apr '21

27 Apr '21

As a default implementation for en_US keyboard layout, calling the driver implementation next so that it can override the result. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Use the english keyboard layout for the default impl, let the driver override the result if they can. * Only copy default buffer to user buffer in nulldrv, to leave user buffer untouched for drivers. ToUnicodeEx is not re-entrant when dealing with dead keys (although I don't think Wine uses that). * Use lstrcpynW instead of wcscpy. * Don't call debugstr_wn if len is < 0. * Drop controversial (Un)LoadKeyboardLayoutW patch for now. Supersedes: 204512, 204513, 204518, 204519 dlls/user32/driver.c | 11 ++- dlls/user32/input.c | 80 ++++++++++++++++++- dlls/user32/user_private.h | 2 +- dlls/wineandroid.drv/keyboard.c | 94 ----------------------- dlls/wineandroid.drv/wineandroid.drv.spec | 1 - dlls/winemac.drv/keyboard.c | 3 +- dlls/winemac.drv/winemac.drv.spec | 2 +- dlls/winex11.drv/keyboard.c | 3 +- dlls/winex11.drv/winex11.drv.spec | 2 +- 9 files changed, 90 insertions(+), 108 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7ac77141696..c385ce0599c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -284,9 +284,11 @@ static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) } static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, - int size, UINT flags, HKL layout ) + int size, UINT flags, HKL layout, + const WCHAR *default_buf, INT default_len ) { - return 0; + lstrcpynW( str, default_buf, size ); + return default_len; } static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) @@ -592,9 +594,10 @@ static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) } static INT CDECL loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, - int size, UINT flags, HKL layout ) + int size, UINT flags, HKL layout, + const WCHAR *default_buf, INT default_len ) { - return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout ); + return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout, default_buf, default_len ); } static BOOL CDECL loaderdrv_UnloadKeyboardLayout( HKL layout ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 805bfe3e9de..51a08d0786b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -877,11 +877,83 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, /**************************************************************************** * ToUnicodeEx (USER32.@) */ -INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, - LPWSTR lpwStr, int size, UINT flags, HKL hkl) +INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, + WCHAR *str, int size, UINT flags, HKL layout ) { - if (!lpKeyState) return 0; - return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); + BOOL shift, ctrl, numlock; + WCHAR buffer[2]; + INT len; + + TRACE_(keyboard)( "virt %u, scan %u, state %p, str %p, size %d, flags %x, layout %p.\n", + virt, scan, state, str, size, flags, layout ); + + if (!state) return 0; + + shift = state[VK_SHIFT] & 0x80; + ctrl = state[VK_CONTROL] & 0x80; + numlock = state[VK_NUMLOCK] & 0x01; + + /* FIXME: English keyboard layout specific */ + + if (scan & 0x8000) buffer[0] = 0; /* key up */ + else if (!ctrl) + { + switch (virt) + { + case VK_BACK: buffer[0] = '\b'; break; + case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; + case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; + case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; + case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; + case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; + case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; + case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; + case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; + case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; + case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; + case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; + case VK_RETURN: buffer[0] = '\r'; break; + case VK_SPACE: buffer[0] = ' '; break; + case VK_TAB: buffer[0] = '\t'; break; + case VK_MULTIPLY: buffer[0] = '*'; break; + case VK_ADD: buffer[0] = '+'; break; + case VK_SUBTRACT: buffer[0] = '-'; break; + case VK_DIVIDE: buffer[0] = '/'; break; + default: + if (virt >= '0' && virt <= '9') + buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; + else if (virt >= 'A' && virt <= 'Z') + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; + else if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) + buffer[0] = '0' + virt - VK_NUMPAD0; + else if (virt == VK_DECIMAL && numlock && !shift) + buffer[0] = '.'; + else + buffer[0] = 0; + break; + } + } + else /* Control codes */ + { + switch (virt) + { + case VK_OEM_4: buffer[0] = 0x1b; break; + case VK_OEM_5: buffer[0] = 0x1c; break; + case VK_OEM_6: buffer[0] = 0x1d; break; + case VK_SUBTRACT: buffer[0] = 0x1e; break; + default: + if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; + else buffer[0] = 0; + break; + } + } + buffer[1] = 0; + len = wcslen( buffer ); + + len = USER_Driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout, buffer, len ); + + TRACE_(keyboard)( "ret %d, str %s.\n", len, len < 0 ? "" : debugstr_wn(str, len) ); + return len; } /**************************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5f8059a12a0..8f9841ec48b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -71,7 +71,7 @@ typedef struct tagUSER_DRIVER { HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); - INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); + INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL, const WCHAR *, INT); BOOL (CDECL *pUnloadKeyboardLayout)(HKL); void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 0a6ede0ec5f..04565c3fad8 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -750,100 +750,6 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } -/*********************************************************************** - * ANDROID_ToUnicodeEx - */ -INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, - LPWSTR buf, int size, UINT flags, HKL hkl ) -{ - WCHAR buffer[2]; - BOOL shift = state[VK_SHIFT] & 0x80; - BOOL ctrl = state[VK_CONTROL] & 0x80; - BOOL numlock = state[VK_NUMLOCK] & 0x01; - - buffer[0] = buffer[1] = 0; - - if (scan & 0x8000) return 0; /* key up */ - - /* FIXME: hardcoded layout */ - - if (!ctrl) - { - switch (virt) - { - case VK_BACK: buffer[0] = '\b'; break; - case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; - case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; - case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; - case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; - case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; - case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; - case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; - case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; - case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; - case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; - case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; - case VK_RETURN: buffer[0] = '\r'; break; - case VK_SPACE: buffer[0] = ' '; break; - case VK_TAB: buffer[0] = '\t'; break; - case VK_MULTIPLY: buffer[0] = '*'; break; - case VK_ADD: buffer[0] = '+'; break; - case VK_SUBTRACT: buffer[0] = '-'; break; - case VK_DIVIDE: buffer[0] = '/'; break; - default: - if (virt >= '0' && virt <= '9') - { - buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; - break; - } - if (virt >= 'A' && virt <= 'Z') - { - buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; - break; - } - if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) - { - buffer[0] = '0' + virt - VK_NUMPAD0; - break; - } - if (virt == VK_DECIMAL && numlock && !shift) - { - buffer[0] = '.'; - break; - } - break; - } - } - else /* Control codes */ - { - if (virt >= 'A' && virt <= 'Z') - buffer[0] = virt - 'A' + 1; - else - { - switch (virt) - { - case VK_OEM_4: - buffer[0] = 0x1b; - break; - case VK_OEM_5: - buffer[0] = 0x1c; - break; - case VK_OEM_6: - buffer[0] = 0x1d; - break; - case VK_SUBTRACT: - buffer[0] = 0x1e; - break; - } - } - } - - lstrcpynW( buf, buffer, size ); - TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); - return strlenW( buffer ); -} - - /*********************************************************************** * ANDROID_GetKeyNameText */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 00de23de27e..6f27c1586b3 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -7,7 +7,6 @@ @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx -@ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl SetCursor(long) ANDROID_SetCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1ea15f59341..d9c819431f2 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1553,7 +1553,8 @@ BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) * */ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, - LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) + LPWSTR bufW, int bufW_size, UINT flags, HKL hkl, + const WCHAR *default_buf, INT default_len) { struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); INT ret = 0; diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 39cf33370b4..97c94b6ee88 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -34,7 +34,7 @@ @ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo @ cdecl ThreadDetach() macdrv_ThreadDetach -@ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx +@ cdecl ToUnicodeEx(long long ptr ptr long long long ptr long) macdrv_ToUnicodeEx @ cdecl UnregisterHotKey(long long long) macdrv_UnregisterHotKey @ cdecl UpdateClipboard() macdrv_UpdateClipboard @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 01620c5e4a4..c45d12c7517 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2432,7 +2432,8 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym) * */ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, - LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) + LPWSTR bufW, int bufW_size, UINT flags, HKL hkl, + const WCHAR *default_buf, INT default_len) { Display *display = thread_init_display(); XKeyEvent e; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index c0e24d8fe82..b73ae87b929 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -11,7 +11,7 @@ @ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx -@ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx +@ cdecl ToUnicodeEx(long long ptr ptr long long long ptr long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx @ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon -- 2.31.0

2 9

[PATCH v2] msado15: Support Properties interface on Field
by Alistair Leslie-Hughes 27 Apr '21

27 Apr '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 144 ++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 20 +++++ 4 files changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3479ceb5b02..6b85c84e8e8 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -184,6 +184,7 @@ static REFIID tid_ids[] = { &IID__Connection, &IID_Field, &IID_Fields, + &IID_Properties, &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 55afac3f389..600dcb90a97 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -48,6 +48,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Properties_tid, Recordset_tid, Stream_tid, LAST_tid diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 68d4c22d802..1fb44a9add1 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -65,6 +65,7 @@ struct field { Field Field_iface; ISupportErrorInfo ISupportErrorInfo_iface; + Properties Properties_iface; LONG refs; WCHAR *name; DataTypeEnum type; @@ -79,6 +80,11 @@ static inline struct field *impl_from_Field( Field *iface ) return CONTAINING_RECORD( iface, struct field, Field_iface ); } +static inline struct field *impl_from_Properties( Properties *iface ) +{ + return CONTAINING_RECORD( iface, struct field, Properties_iface ); +} + static ULONG WINAPI field_AddRef( Field *iface ) { struct field *field = impl_from_Field( iface ); @@ -181,8 +187,12 @@ static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LC static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) { - FIXME( "%p, %p\n", iface, obj ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %p\n", iface, obj ); + + *obj = &field->Properties_iface; + Properties_AddRef(&field->Properties_iface); + return S_OK; } static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) @@ -447,6 +457,135 @@ static const ISupportErrorInfoVtbl field_supporterrorinfo_vtbl = field_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI field_props_QueryInterface(Properties *iface, REFIID riid, void **ppv) +{ + struct field *field = impl_from_Properties( iface ); + + if (IsEqualGUID( riid, &IID_Properties) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppv = &field->Properties_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + Field_AddRef(&field->Field_iface); + return S_OK; +} + +static ULONG WINAPI field_props_AddRef(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_AddRef(&field->Field_iface); +} + +static ULONG WINAPI field_props_Release(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + return Field_Release(&field->Field_iface); +} + +static HRESULT WINAPI field_props_GetTypeInfoCount(Properties *iface, UINT *count) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %p\n", field, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI field_props_GetTypeInfo(Properties *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + struct field *field = impl_from_Properties( iface ); + TRACE( "%p, %u, %u, %p\n", field, index, lcid, info ); + return get_typeinfo(Properties_tid, info); +} + +static HRESULT WINAPI field_props_GetIDsOfNames(Properties *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_Invoke(Properties *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + struct field *field = impl_from_Properties( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + + hr = get_typeinfo(Properties_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &field->Field_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI field_props_get_Count(Properties *iface, LONG *count) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, count); + *count = 0; + return S_OK; +} + +static HRESULT WINAPI field_props__NewEnum(Properties *iface, IUnknown **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %p\n", field, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_Refresh(Properties *iface) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p\n", field); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_props_get_Item(Properties *iface, VARIANT index, Property **object) +{ + struct field *field = impl_from_Properties( iface ); + FIXME( "%p, %s, %p\n", field, debugstr_variant(&index), object); + return MAKE_ADO_HRESULT(adErrItemNotFound);; +} + +static struct PropertiesVtbl field_properties_vtbl = +{ + field_props_QueryInterface, + field_props_AddRef, + field_props_Release, + field_props_GetTypeInfoCount, + field_props_GetTypeInfo, + field_props_GetIDsOfNames, + field_props_Invoke, + field_props_get_Count, + field_props__NewEnum, + field_props_Refresh, + field_props_get_Item +}; + static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) { struct field *field; @@ -454,6 +593,7 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; + field->Properties_iface.lpVtbl = &field_properties_vtbl; if (!(field->name = strdupW( name ))) { heap_free( field ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index db606f21fab..b5f1b70dedd 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,8 @@ static void test_Recordset(void) ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; + Properties *props; + Property *prop; LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; @@ -184,6 +186,24 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( name ); + hr = Field_QueryInterface(field, &IID_Properties, (void**)&props); + ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + + hr = Field_get_Properties(field, &props); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Properties_get_Count(props, &count); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Properties_get_Item(props, index, &prop); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + Properties_Release(props); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); ok( is_eof( recordset ), "not eof\n" ); -- 2.30.2

2 1