wine-devel December 2019

wine-devel@winehq.org

73 participants
634 discussions

[PATCH] winemac.drv: Fix the spelling of a couple of comments.
by Francois Gouget 11 Dec '19

11 Dec '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winemac.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index bafdb425897..b58a9d172b4 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1468,12 +1468,12 @@ static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match - * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + * them via the GUID in Device Parameters/VideoID, but it would require enumerating all GPU instances */ sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; - /* Write all monitor instances paths under this adapter */ + /* Write all monitor instance paths under this adapter */ for (i = 0; i < monitor_count; i++) { sprintfW(key_nameW, mointor_id_fmtW, i); -- 2.20.1

2 1

[PATCH] msvcrt: Fix the btowc() function.
by Chip Davis 11 Dec '19

11 Dec '19

This function returns WEOF on conversion failure. It should only operate on ASCII characters in the C locale. Finally, it should use the current codepage, instead of the current locale, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/msvcrt/locale.c | 6 ++++-- dlls/msvcrt/tests/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 11ad9ed5f5f..57783d9d4b6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -787,9 +787,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], + if(!get_locinfo()->lc_codepage) + return c <= 127 ? c : MSVCRT_WEOF; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791c..fe27c826f3e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -87,6 +87,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2829,6 +2830,42 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4007,6 +4044,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); -- 2.24.0

1 1

[PATCH 4/5] msado15: Implement Fields_get_Count.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 8 ++++-- dlls/msado15/tests/msado15.c | 48 ++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ed3cdf6bbf..99d22e4db0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -388,8 +388,12 @@ static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %p\n", fields, count ); + + *count = fields->count; + return S_OK; } static HRESULT WINAPI fields__NewEnum( Fields *iface, IUnknown **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e6371b8392..4ef4762ac6 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -77,8 +77,8 @@ static void test_Recordset(void) 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 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); @@ -88,6 +88,49 @@ static void test_Recordset(void) ok( refs == 1, "got %d\n", refs ); } +static void test_Fields(void) +{ + _Recordset *recordset; + Fields *fields; + VARIANT val; + BSTR name; + LONG count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( !count, "got %d\n", count ); + + name = SysAllocString( L"field" ); + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Fields_Append( fields, name, adInteger, 4, adFldUnspecified, val ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 1, "got %d\n", count ); + + name = SysAllocString( L"field2" ); + hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 2, "got %d\n", count ); + + Fields_Release( fields ); + _Recordset_Release( recordset ); +} + static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) { SAFEARRAY *vector; @@ -406,6 +449,7 @@ START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_Fields(); test_Recordset(); test_Stream(); CoUninitialize(); -- 2.20.1

2 1

[PATCH 2/5] msado15: Implement _Recordset_get_Fields.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(); } -- 2.20.1

2 1

[PATCH 5/5] msado15: Implement Field_put_Type, Field_put_DefinedSize and Field_put_Attributes.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 99d22e4db0..78d13d1577 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -54,6 +54,9 @@ struct field Field Field_iface; LONG refs; WCHAR *name; + DataTypeEnum type; + LONG defined_size; + LONG attrs; LONG index; struct recordset *recordset; }; @@ -240,20 +243,32 @@ static HRESULT WINAPI field_put_NumericScale( Field *iface, unsigned char scale static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) { - FIXME( "%p, %u\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %u\n", field, type ); + + field->type = type; + return S_OK; } static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) { - FIXME( "%p, %d\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, size ); + + field->defined_size = size; + return S_OK; } static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs ) { - FIXME( "%p, %d\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, attrs ); + + field->attrs = attrs; + return S_OK; } static HRESULT WINAPI field_get_Status( Field *iface, LONG *status ) -- 2.20.1

2 1

[PATCH 3/5] msado15: Implement Fields__Append and Fields_Append.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 325 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index f520a87807..ed3cdf6bbf 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -41,11 +41,279 @@ struct recordset struct fields { - Fields Fields_iface; - LONG refs; - struct recordset *recordset; + Fields Fields_iface; + LONG refs; + Field **field; + ULONG count; + ULONG allocated; + struct recordset *recordset; }; +struct field +{ + Field Field_iface; + LONG refs; + WCHAR *name; + LONG index; + struct recordset *recordset; +}; + +static inline struct field *impl_from_Field( Field *iface ) +{ + return CONTAINING_RECORD( iface, struct field, Field_iface ); +} + +static ULONG WINAPI field_AddRef( Field *iface ) +{ + struct field *field = impl_from_Field( iface ); + LONG refs = InterlockedIncrement( &field->refs ); + TRACE( "%p new refcount %d\n", field, refs ); + return refs; +} + +static ULONG WINAPI field_Release( Field *iface ) +{ + struct field *field = impl_from_Field( iface ); + LONG refs = InterlockedDecrement( &field->refs ); + TRACE( "%p new refcount %d\n", field, refs ); + if (!refs) + { + TRACE( "destroying %p\n", field ); + heap_free( field->name ); + heap_free( field ); + } + return refs; +} + +static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + if (IsEqualGUID( riid, &IID_Field ) || IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + field_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI field_GetTypeInfoCount( Field *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetTypeInfo( Field *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetIDsOfNames( Field *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 field_Invoke( Field *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 field_get_Properties( Field *iface, Properties **obj ) +{ + FIXME( "%p, %p\n", iface, obj ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) +{ + TRACE( "%p, %p\n", iface, attrs ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) +{ + FIXME( "%p, %p\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) +{ + FIXME( "%p, %p\n", iface, str ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) +{ + FIXME( "%p, %p\n", iface, precision ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_NumericScale( Field *iface, unsigned char *scale ) +{ + FIXME( "%p, %p\n", iface, scale ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_AppendChunk( Field *iface, VARIANT data ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&data) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_GetChunk( Field *iface, LONG length, VARIANT *var ) +{ + FIXME( "%p, %d, %p\n", iface, length, var ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_OriginalValue( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_UnderlyingValue( Field *iface, VARIANT *val ) +{ + FIXME( "%p, %p\n", iface, val ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_DataFormat( Field *iface, IUnknown **format ) +{ + FIXME( "%p, %p\n", iface, format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_putref_DataFormat( Field *iface, IUnknown *format ) +{ + FIXME( "%p, %p\n", iface, format ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Precision( Field *iface, unsigned char precision ) +{ + FIXME( "%p, %c\n", iface, precision ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_NumericScale( Field *iface, unsigned char scale ) +{ + FIXME( "%p, %c\n", iface, scale ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) +{ + FIXME( "%p, %u\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) +{ + FIXME( "%p, %d\n", iface, size ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs ) +{ + FIXME( "%p, %d\n", iface, attrs ); + return E_NOTIMPL; +} + +static HRESULT WINAPI field_get_Status( Field *iface, LONG *status ) +{ + FIXME( "%p, %p\n", iface, status ); + return E_NOTIMPL; +} + +static const struct FieldVtbl field_vtbl = +{ + field_QueryInterface, + field_AddRef, + field_Release, + field_GetTypeInfoCount, + field_GetTypeInfo, + field_GetIDsOfNames, + field_Invoke, + field_get_Properties, + field_get_ActualSize, + field_get_Attributes, + field_get_DefinedSize, + field_get_Name, + field_get_Type, + field_get_Value, + field_put_Value, + field_get_Precision, + field_get_NumericScale, + field_AppendChunk, + field_GetChunk, + field_get_OriginalValue, + field_get_UnderlyingValue, + field_get_DataFormat, + field_putref_DataFormat, + field_put_Precision, + field_put_NumericScale, + field_put_Type, + field_put_DefinedSize, + field_put_Attributes, + field_get_Status +}; + +static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) +{ + struct field *field; + + if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; + field->Field_iface.lpVtbl = &field_vtbl; + if (!(field->name = strdupW( name ))) + { + heap_free( field ); + return E_OUTOFMEMORY; + } + field->index = index; + field->recordset = recordset; + + *obj = &field->Field_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + static inline struct fields *impl_from_Fields( Fields *iface ) { return CONTAINING_RECORD( iface, struct fields, Fields_iface ); @@ -142,10 +410,50 @@ static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj return E_NOTIMPL; } +static BOOL resize_fields( struct fields *fields, ULONG count ) +{ + if (count > fields->allocated) + { + Field **tmp; + ULONG new_size = max( count, fields->allocated * 2 ); + if (!(tmp = heap_realloc( fields->field, new_size * sizeof(*tmp) ))) return FALSE; + fields->field = tmp; + fields->allocated = new_size; + } + + fields->count = count; + return TRUE; +} + +static HRESULT append_field( struct fields *fields, BSTR name, DataTypeEnum type, LONG size, FieldAttributeEnum attr, + VARIANT *value ) +{ + Field *field; + HRESULT hr; + + if ((hr = Field_create( name, fields->count, fields->recordset, &field )) != S_OK) return hr; + Field_put_Type( field, type ); + Field_put_DefinedSize( field, size ); + if (attr != adFldUnspecified) Field_put_Attributes( field, attr ); + if (value) FIXME( "ignoring value %s\n", debugstr_variant(value) ); + + if (!(resize_fields( fields, fields->count + 1 ))) + { + Field_Release( field ); + return E_OUTOFMEMORY; + } + + fields->field[fields->count - 1] = field; + return S_OK; +} + 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; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %s, %u, %d, %d\n", fields, debugstr_w(name), type, size, attr ); + + return append_field( fields, name, type, size, attr, NULL ); } static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) @@ -157,8 +465,11 @@ static HRESULT WINAPI fields_Delete( Fields *iface, VARIANT index ) 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; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %s, %u, %d, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) ); + + return append_field( fields, name, type, size, attr, &value ); } static HRESULT WINAPI fields_Update( Fields *iface ) -- 2.20.1

2 1

[PATCH 1/5] msado15: Implement _Stream_SetEOS.
by Hans Leidekker 11 Dec '19

11 Dec '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 ); -- 2.20.1

1 0

[PATCH 2/2] msado15: Implement _Connection_get_CommandTimeout and _Connection_put_CommandTimeout.
by Hans Leidekker 11 Dec '19

11 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize test variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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); } -- 2.20.1

1 0

[PATCH 1/2] msado15: Implement _Connection_get_State.
by Hans Leidekker 11 Dec '19

11 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize test variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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(); } -- 2.20.1

1 0

[PATCH v2 01/11] vbscript: Implement ScriptTypeInfo_GetNames.
by Gabriel Ivăncescu 11 Dec '19

11 Dec '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use binary search. dlls/vbscript/vbdisp.c | 67 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6dc34b3..373efcc 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -546,6 +546,26 @@ typedef struct { ScriptDisp *disp; } ScriptTypeInfo; +static function_t *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + if (!(memid & DISPID_FUNCTION_MASK)) return NULL; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + + if (memid == typeinfo->funcs[i].memid) + return typeinfo->funcs[i].func; + else if (memid < typeinfo->funcs[i].memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -707,10 +727,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + 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 && memid > This->num_vars) + { + 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; + + if (func) + { + UINT num = min(cMaxNames, func->arg_cnt + 1); + + rgBstrNames[0] = SysAllocString(func->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + + for (i = 1; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->args[i - 1].name))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + else + { + rgBstrNames[0] = SysAllocString(This->disp->global_vars[memid - 1]->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) -- 2.21.0

2 13

← Newer
1
...
27
28
29
30
31
32
33
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2019