December 2019 - Wine-Commits

Hans Leidekker : msado15: Implement _Recordset_get_Fields.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: bd76c7a8450781acecfadfb3c9f79a69a68d731c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd76c7a8450781acecfadfb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 17:18:26 2019 +0100 msado15: Implement _Recordset_get_Fields. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 202 ++++++++++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 66 +++++++++++++- 2 files changed, 263 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 84adec406f..f520a87807 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -31,12 +31,190 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; + _Recordset Recordset_iface; + LONG refs; + struct fields *fields; }; +struct fields +{ + Fields Fields_iface; + LONG refs; + struct recordset *recordset; +}; + +static inline struct fields *impl_from_Fields( Fields *iface ) +{ + return CONTAINING_RECORD( iface, struct fields, Fields_iface ); +} + +static ULONG WINAPI fields_AddRef( Fields *iface ) +{ + struct fields *fields = impl_from_Fields( iface ); + LONG refs = InterlockedIncrement( &fields->refs ); + TRACE( "%p new refcount %d\n", fields, refs ); + return refs; +} + +static ULONG WINAPI fields_Release( Fields *iface ) +{ + struct fields *fields = impl_from_Fields( iface ); + LONG refs = InterlockedDecrement( &fields->refs ); + TRACE( "%p new refcount %d\n", fields, refs ); + if (!refs) + { + if (fields->recordset) _Recordset_Release( &fields->recordset->Recordset_iface ); + WARN( "not destroying %p\n", fields ); + return InterlockedIncrement( &fields->refs ); + } + return refs; +} + +static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_Fields ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + fields_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fields_GetTypeInfoCount( Fields *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_GetTypeInfo( Fields *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_GetIDsOfNames( Fields *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid ) +{ + FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) +{ + FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields__NewEnum( Fields *iface, IUnknown **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Refresh( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) +{ + FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr ) +{ + FIXME( "%p, %s, %u, %d, %d\n", iface, debugstr_w(name), type, size, attr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&index) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, + VARIANT value ) +{ + TRACE( "%p, %s, %u, %d, %d, %s\n", iface, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Update( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_Resync( Fields *iface, ResyncEnum resync_values ) +{ + FIXME( "%p, %u\n", iface, resync_values ); + return E_NOTIMPL; +} + +static HRESULT WINAPI fields_CancelUpdate( Fields *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static const struct FieldsVtbl fields_vtbl = +{ + fields_QueryInterface, + fields_AddRef, + fields_Release, + fields_GetTypeInfoCount, + fields_GetTypeInfo, + fields_GetIDsOfNames, + fields_Invoke, + fields_get_Count, + fields__NewEnum, + fields_Refresh, + fields_get_Item, + fields__Append, + fields_Delete, + fields_Append, + fields_Update, + fields_Resync, + fields_CancelUpdate +}; + +static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) +{ + struct fields *fields; + + if (!(fields = heap_alloc_zero( sizeof(*fields) ))) return E_OUTOFMEMORY; + fields->Fields_iface.lpVtbl = &fields_vtbl; + fields->refs = 1; + fields->recordset = recordset; + _Recordset_AddRef( &fields->recordset->Recordset_iface ); + + *ret = fields; + TRACE( "returning %p\n", *ret ); + return S_OK; +} + static inline struct recordset *impl_from_Recordset( _Recordset *iface ) { return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); @@ -58,6 +236,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); + recordset->fields->recordset = NULL; heap_free( recordset ); } return refs; @@ -199,8 +378,23 @@ static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj ) { - FIXME( "%p, %p\n", iface, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + + TRACE( "%p, %p\n", recordset, obj ); + + if (recordset->fields) + { + /* yes, this adds a reference to the recordset instead of the fields object */ + _Recordset_AddRef( &recordset->Recordset_iface ); + *obj = &recordset->fields->Fields_iface; + return S_OK; + } + + if ((hr = fields_create( recordset, &recordset->fields )) != S_OK) return hr; + + *obj = &recordset->fields->Fields_iface; + return S_OK; } static HRESULT WINAPI recordset_get_LockType( _Recordset *iface, LockTypeEnum *lock_type ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 3f297f4ce2..e6371b8392 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,69 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_fields( Fields *fields ) +{ + Fields_AddRef( fields ); + return Fields_Release( fields ); +} + +static LONG get_refs_recordset( _Recordset *recordset ) +{ + _Recordset_AddRef( recordset ); + return _Recordset_Release( recordset ); +} + +static void test_Recordset(void) +{ + _Recordset *recordset; + Fields *fields, *fields2; + LONG refs, count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* handing out fields object increases recordset refcount */ + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* releasing fields object decreases recordset refcount, but fields refcount doesn't drop to zero */ + Fields_Release( fields ); + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Fields again returns the same object with the same refcount and increases recordset refcount */ + hr = _Recordset_get_Fields( recordset, &fields2 ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields2 ); + ok( refs == 1, "got %d\n", refs ); + ok( fields2 == fields, "expected same object\n" ); + refs = Fields_Release( fields2 ); + ok( refs == 1, "got %d\n", refs ); + + count = -1; + hr = Fields_get_Count( fields2, &count ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( !count, "got %d\n", count ); + + refs = _Recordset_Release( recordset ); + ok( !refs, "got %d\n", refs ); + + /* fields object still has a reference */ + refs = Fields_Release( fields2 ); + ok( refs == 1, "got %d\n", refs ); +} + static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) { SAFEARRAY *vector; @@ -342,7 +405,8 @@ if (0) /* Crashes on windows */ START_TEST(msado15) { CoInitialize( NULL ); - test_Stream(); test_Connection(); + test_Recordset(); + test_Stream(); CoUninitialize(); }

1 0

Hans Leidekker : msado15: Implement _Stream_SetEOS.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: aa0e7aa1fd6b34b223b48ce84d65e437a00d0693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0e7aa1fd6b34b223b48ce8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 17:18:25 2019 +0100 msado15: Implement _Stream_SetEOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/stream.c | 7 +++++-- dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 52f35afe3c..c6add70b1b 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -370,8 +370,11 @@ static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) static HRESULT WINAPI stream_SetEOS( _Stream *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + + TRACE( "%p\n", stream ); + + return resize_buffer( stream, stream->pos ); } static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, LONG size ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a63ab445a1..3f297f4ce2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -210,6 +210,19 @@ static void test_Stream(void) hr = _Stream_put_Position( stream, 2 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_SetEOS( stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 2, "got %d\n", pos ); + + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 2, "got %d\n", size ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Nikolay Sivov : comctl32/listbox: Update caret index on LB_SETSEL.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 7f498f460703db687ce465fecd729f93b844bde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f498f460703db687ce465fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 15:17:52 2019 +0300 comctl32/listbox: Update caret index on LB_SETSEL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 4 ++++ dlls/comctl32/tests/listbox.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2b8c2ba086..f9b4e0aeaf 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2858,7 +2858,11 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); if (ret != LB_ERR && wParam) + { descr->anchor_item = lParam; + if (lParam != -1) + LISTBOX_SetCaretIndex( descr, lParam, TRUE ); + } return ret; case LB_SETCURSEL: diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index a3769423ee..4d44137e4d 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -707,16 +707,22 @@ static void test_LB_SETSEL(void) ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); @@ -731,16 +737,22 @@ static void test_LB_SETSEL(void) ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); }

1 0

Nikolay Sivov : user32/listbox: Update caret index on LB_SETSEL.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 832b748b06290d6c6fa0e1fcc7b332019a4cb80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=832b748b06290d6c6fa0e1fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 15:17:50 2019 +0300 user32/listbox: Update caret index on LB_SETSEL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 4 ++++ dlls/user32/tests/listbox.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 95f6a23a28..65b052eb62 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2963,7 +2963,11 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); if (ret != LB_ERR && wParam) + { descr->anchor_item = lParam; + if (lParam != -1) + LISTBOX_SetCaretIndex( descr, lParam, TRUE ); + } return ret; case LB_SETCURSEL: diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 9f6f45990f..cd372f8ac5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -583,21 +583,29 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); @@ -607,21 +615,29 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); }

1 0

Nikolay Sivov : comctl32/listbox: Scroll to specified caret index.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 1a25f47d5978e2a63874c484bd4650ed1d0fdef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a25f47d5978e2a63874c484… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 15:17:51 2019 +0300 comctl32/listbox: Scroll to specified caret index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 0d6dcd6a0b..2b8c2ba086 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1462,19 +1462,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; }

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection_get_State.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 131cfe0b65f7149c79915fb0f74b1e4d6fafa438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131cfe0b65f7149c79915fb0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 11 17:16:52 2019 +0100 msado15: Implement _Connection_get_State. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 43497636a8..c9799862bf 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -34,6 +34,8 @@ struct connection { _Connection Connection_iface; LONG refs; + + ObjectStateEnum state; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -271,8 +273,10 @@ static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, state ); + *state = connection->state; + return S_OK; } static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, @@ -337,6 +341,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; + connection->state = adStateClosed; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 079da0a103..8249a398ba 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -280,9 +280,43 @@ static void test_Stream(void) ok( !refs, "got %d\n", refs ); } +static void test_Connection(void) +{ + HRESULT hr; + _Connection *connection; + IRunnableObject *runtime; + ISupportErrorInfo *errorinfo; + LONG state; + + hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); + todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + if (hr == S_OK) + ISupportErrorInfo_Release(errorinfo); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_State(connection, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr 0x%08x\n", hr); +} + + state = -1; + hr = _Connection_get_State(connection, &state); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + + _Connection_Release(connection); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Stream(); + test_Connection(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection_get_CommandTimeout and _Connection_put_CommandTimeout.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: dade5b7eb7921e010a0ee3b904a7fa6e48fa2f14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dade5b7eb7921e010a0ee3b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 11 17:16:53 2019 +0100 msado15: Implement _Connection_get_CommandTimeout and _Connection_put_CommandTimeout. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index c9799862bf..037ab52199 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -36,6 +36,7 @@ struct connection LONG refs; ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -126,14 +127,18 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) { - FIXME( "%p, %p\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, timeout ); + *timeout = connection->timeout; + return S_OK; } static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) { - FIXME( "%p, %d\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %d\n", connection, timeout ); + connection->timeout = timeout; + return S_OK; } static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) @@ -342,6 +347,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; connection->state = adStateClosed; + connection->timeout = 30; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8249a398ba..a63ab445a1 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -286,7 +286,7 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; - LONG state; + LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -310,6 +310,19 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + timeout = 0; + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + + hr = _Connection_put_CommandTimeout(connection, 300); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + timeout = 0; + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + _Connection_Release(connection); }

1 0

Hans Leidekker : msado15: Implement Fields__Append and Fields_Append.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 0e897cb53eea227af71979cb3f040906bb024ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e897cb53eea227af71979cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 17:18:27 2019 +0100 msado15: Implement Fields__Append and Fields_Append. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e897cb53eea227af719…

1 0

Nikolay Sivov : user32/listbox: Scroll to specified caret index.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: b37b3f00a646d3836a4a26398b02a95612340699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37b3f00a646d3836a4a2639… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 15:17:49 2019 +0300 user32/listbox: Scroll to specified caret index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3949610e50..95f6a23a28 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1473,19 +1473,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; }

1 0

Francois Gouget : shell32: Fix the spelling of a variable name.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: fc0ccc4486cf837871e33c65d6a6837df0ff9bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc0ccc4486cf837871e33c65… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:57:52 2019 +0100 shell32: Fix the spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index d3f20c225b..a501dea2e7 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -890,7 +890,7 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); static WCHAR urlassoc[] = {'U','r','l','A','s','s','o','c','i','a','t','i','o','n','s',0}; static WCHAR mimeassoc[] = {'M','I','M','E','A','s','s','o','c','i','a','t','i','o','n','s',0}; - static WCHAR assocations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + static WCHAR associations[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','S','h','e','l','l','\\', 'A','s','s','o','c','i','a','t','i','o','n','s',0}; static WCHAR slash[] = {'\\',0}; @@ -940,7 +940,7 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp } else { - ret = RegOpenKeyExW(HKEY_CURRENT_USER, assocations, 0, KEY_READ, &hkey); + ret = RegOpenKeyExW(HKEY_CURRENT_USER, associations, 0, KEY_READ, &hkey); if(ret == ERROR_SUCCESS) { if(type == AT_URLPROTOCOL)

1 0