December 2019 - Wine-Devel - list.winehq.org

[PATCH] ntoskrnl.exe/tests: Fix typos in ok() messages.
by Andrey Gusev Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status); -- 2.23.0

2 1

[PATCH] ole32: Fix typos in comments.
by Andrey Gusev Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ole32/compobj.c | 2 +- dlls/ole32/storage32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a91067fcb7..daa405356f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4763,7 +4763,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * PARAMS * pszName [I] String representing the object. * pBindOptions [I] Parameters affecting the binding to the named object. - * riid [I] Interface to bind to on the objecct. + * riid [I] Interface to bind to on the object. * ppv [O] On output, the interface riid of the object represented * by pszName. * diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 515880ec36..6b05669a5e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8622,7 +8622,7 @@ end: * pwcsName [ I] Unicode string with filename (can be relative or NULL) * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * ppstgOpen [IO] A pointer to IStorage pointer to the new object * * RETURNS * S_OK if the file was successfully created -- 2.23.0

1 0

[PATCH 5/5] msado15: Implement _Recordset_Open and _Recordset_Close.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b214f9d077..e854b3e824 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -901,8 +901,13 @@ static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) static HRESULT WINAPI recordset_Close( _Recordset *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p\n", recordset ); + + close_recordset( recordset ); + recordset->state = adStateClosed; + return S_OK; } static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_records ) @@ -950,9 +955,13 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) { - FIXME( "%p, %s, %s, %d, %d, %d\n", iface, debugstr_variant(&source), debugstr_variant(&active_connection), + struct recordset *recordset = impl_from_Recordset( iface ); + + FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); - return E_NOTIMPL; + + recordset->state = adStateOpen; + return S_OK; } static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options ) -- 2.20.1

1 0

[PATCH 4/5] msado15: Implement Field_get_Value and Field_put_Value.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 67 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b262243d89..b214f9d077 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -36,7 +36,12 @@ struct recordset { _Recordset Recordset_iface; LONG refs; + LONG state; struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields @@ -187,16 +192,51 @@ static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) return S_OK; } +static LONG get_column_count( struct recordset *recordset ) +{ + return recordset->fields->count; +} + static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) { - FIXME( "%p, %p\n", iface, val ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %p\n", field, val ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &field->recordset->data[row * col_count + col] )) != S_OK) return hr; + + *val = copy; + return S_OK; } static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&val) ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + ULONG row = field->recordset->index, col = field->index, col_count; + VARIANT copy; + HRESULT hr; + + TRACE( "%p, %s\n", field, debugstr_variant(&val) ); + + if (field->recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (field->recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + col_count = get_column_count( field->recordset ); + + VariantInit( &copy ); + if ((hr = VariantCopy( &copy, &val )) != S_OK) return hr; + + field->recordset->data[row * col_count + col] = copy; + return S_OK; } static HRESULT WINAPI field_get_Precision( Field *iface, unsigned char *precision ) @@ -614,6 +654,22 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) return refs; } +static void close_recordset( struct recordset *recordset ) +{ + ULONG row, col, col_count = get_column_count( recordset ); + + recordset->fields->recordset = NULL; + Fields_Release( &recordset->fields->Fields_iface ); + recordset->fields = NULL; + + for (row = 0; row < recordset->count; row++) + for (col = 0; col < col_count; col++) VariantClear( &recordset->data[row * col_count + col] ); + + recordset->count = recordset->allocated = recordset->index = 0; + heap_free( recordset->data ); + recordset->data = NULL; +} + static ULONG WINAPI recordset_Release( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -622,7 +678,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) if (!refs) { TRACE( "destroying %p\n", recordset ); - recordset->fields->recordset = NULL; + close_recordset( recordset ); heap_free( recordset ); } return refs; @@ -1264,6 +1320,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->refs = 1; + recordset->index = -1; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement Field_get_Attributes and Field_get_DefinedSize.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 16 ++++++++++++---- dlls/msado15/tests/msado15.c | 22 +++++++++++++++++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ff06b8789a..b262243d89 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -147,14 +147,22 @@ static HRESULT WINAPI field_get_ActualSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs ) { - TRACE( "%p, %p\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, attrs ); + + *attrs = field->attrs; + return S_OK; } static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, size ); + + *size = field->defined_size; + return S_OK; } static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 800eb236fe..f9a5377c50 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -101,7 +101,9 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count; + LONG refs, count, size; + DataTypeEnum type; + FieldAttributeEnum attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -164,6 +166,24 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* verify values set with _Append */ + hr = Field_get_Name( field, &name ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( name, L"field" ), "got %s\n", wine_dbgstr_w(name) ); + SysFreeString( name ); + type = 0xdead; + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 4, "got %d\n", size ); + attrs = 0xdead; + hr = Field_get_Attributes( field, &attrs ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !attrs, "got %d\n", attrs ); + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); -- 2.20.1

1 0

[PATCH 2/5] msado15: Implement Fields_get_Item.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 42 ++++++++++++++++++++++++++++++++++-- dlls/msado15/tests/msado15.c | 42 ++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a20d5920da..ff06b8789a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -433,10 +433,48 @@ static HRESULT WINAPI fields_Refresh( Fields *iface ) return E_NOTIMPL; } +static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) +{ + ULONG i; + + if (V_VT( index ) != VT_BSTR) + { + FIXME( "variant type %u not supported\n", V_VT( index ) ); + return E_INVALIDARG; + } + + for (i = 0; i < fields->count; i++) + { + BSTR name; + BOOL match; + HRESULT hr; + + if ((hr = Field_get_Name( fields->field[i], &name )) != S_OK) return hr; + match = !wcsicmp( V_BSTR( index ), name ); + SysFreeString( name ); + if (match) + { + *ret = i; + return S_OK; + } + } + + return E_INVALIDARG; +} + 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; + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ULONG i; + + TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj ); + + if ((hr = map_index( fields, &index, &i )) != S_OK) return hr; + + Field_AddRef( fields->field[i] ); + *obj = fields->field[i]; + return S_OK; } static BOOL resize_fields( struct fields *fields, ULONG count ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 03b2828d9f..800eb236fe 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,12 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_field( Field *field ) +{ + Field_AddRef( field ); + return Field_Release( field ); +} + static LONG get_refs_fields( Fields *fields ) { Fields_AddRef( fields ); @@ -92,9 +98,10 @@ static void test_Fields(void) { _Recordset *recordset; Fields *fields; - VARIANT val; + Field *field, *field2; + VARIANT val, index; BSTR name; - LONG count; + LONG refs, count; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -127,6 +134,37 @@ static void test_Fields(void) hr = Fields_get_Count( fields, &count ); ok( count == 2, "got %d\n", count ); + /* handing out field object doesn't add reference to fields or recordset object */ + name = SysAllocString( L"field" ); + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = name; + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Item again returns the same object and adds reference */ + hr = Fields_get_Item( fields, index, &field2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( field2 == field, "expected same object\n" ); + refs = get_refs_field( field2 ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + Field_Release( field2 ); + SysFreeString( name ); + + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); } -- 2.20.1

1 0

[PATCH 1/5] msado15: Implement Field_get_Name and Field_get_Type.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

Applies after 175712. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 78d13d1577..a20d5920da 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -159,14 +159,24 @@ static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + BSTR name; + + TRACE( "%p, %p\n", field, str ); + + if (!(name = SysAllocString( field->name ))) return E_OUTOFMEMORY; + *str = name; + return S_OK; } static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, type ); + + *type = field->type; + return S_OK; } static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val ) -- 2.20.1

1 0

[PATCH 2/2] msado15: Add _Command stub interface.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/Makefile.in | 1 + dlls/msado15/command.c | 313 +++++++++++++++++++++++++++++++ dlls/msado15/main.c | 5 + dlls/msado15/msado15_classes.idl | 8 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 27 +++ 6 files changed, 355 insertions(+) create mode 100644 dlls/msado15/command.c diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 604f9ff018..9852e0863d 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + command.c \ connection.c \ main.c \ recordset.c \ diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c new file mode 100644 index 0000000000..a96fd73990 --- /dev/null +++ b/dlls/msado15/command.c @@ -0,0 +1,313 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "msado15_backcompat.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include "msado15_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msado15); + +struct command +{ + _Command Command_iface; + LONG ref; +}; + +static inline struct command *impl_from_Command( _Command *iface ) +{ + return CONTAINING_RECORD( iface, struct command, Command_iface ); +} + +static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void **obj ) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Command15) || + IsEqualIID(riid, &IID_Command25) || + IsEqualIID(riid, &IID__Command)) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + + _Command_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI command_AddRef( _Command *iface ) +{ + struct command *command = impl_from_Command( iface ); + return InterlockedIncrement( &command->ref ); +} + +static ULONG WINAPI command_Release( _Command *iface ) +{ + struct command *command = impl_from_Command( iface ); + LONG ref = InterlockedDecrement( &command->ref ); + if (!ref) + { + TRACE( "destroying %p\n", command ); + heap_free( command ); + } + return ref; +} + +static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count ) +{ + FIXME( "%p, %p\n", iface, count ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info ) +{ + FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_GetIDsOfNames( _Command *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 command_Invoke( _Command *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 command_get_Properties( _Command *iface, Properties **props ) +{ + FIXME( "%p, %p\n", iface, props ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) +{ + FIXME( "%p, %p\n", iface, connection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&connection) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandText( _Command *iface, BSTR *text ) +{ + FIXME( "%p, %p\n", iface, text ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(text) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout ) +{ + FIXME( "%p, %p\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandTimeout( _Command *iface, LONG timeout ) +{ + FIXME( "%p, %d\n", iface, timeout ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Prepared( _Command *iface, VARIANT_BOOL *prepared ) +{ + FIXME( "%p, %p\n", iface, prepared ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Prepared( _Command *iface, VARIANT_BOOL prepared ) +{ + FIXME( "%p, %d\n", iface, prepared ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIANT *parameters, + LONG options, _Recordset **recordset ) +{ + FIXME( "%p, %p, %p, %d, %p\n", iface, affected, parameters, options, recordset ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataTypeEnum type, + ParameterDirectionEnum direction, LONG size, VARIANT value, + _Parameter **parameter ) +{ + FIXME( "%p, %s, %d, %d, %d, %p\n", iface, debugstr_w(name), type, direction, size, parameter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **parameters ) +{ + FIXME( "%p, %p\n", iface, parameters ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) +{ + FIXME( "%p, %d\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) +{ + FIXME( "%p, %p\n", iface, type ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) +{ + FIXME( "%p, %p\n", iface, name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Name( _Command *iface, BSTR name ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(name) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_State( _Command *iface, LONG *state ) +{ + FIXME( "%p, %p\n", iface, state ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_Cancel( _Command *iface ) +{ + FIXME( "%p\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_putref_CommandStream( _Command *iface, IUnknown *stream ) +{ + FIXME( "%p, %p\n", iface, stream ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_CommandStream( _Command *iface, VARIANT *stream ) +{ + FIXME( "%p, %p\n", iface, stream ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_Dialect( _Command *iface, BSTR dialect ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(dialect) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_Dialect( _Command *iface, BSTR *dialect ) +{ + FIXME( "%p, %p\n", iface, dialect ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_put_NamedParameters( _Command *iface, VARIANT_BOOL parameters ) +{ + FIXME( "%p, %d\n", iface, parameters ); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_get_NamedParameters( _Command *iface, VARIANT_BOOL *parameters ) +{ + FIXME( "%p, %p\n", iface, parameters ); + return E_NOTIMPL; +} + +static const struct _CommandVtbl command_vtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_GetTypeInfoCount, + command_GetTypeInfo, + command_GetIDsOfNames, + command_Invoke, + command_get_Properties, + command_get_ActiveConnection, + command_putref_ActiveConnection, + command_put_ActiveConnection, + command_get_CommandText, + command_put_CommandText, + command_get_CommandTimeout, + command_put_CommandTimeout, + command_get_Prepared, + command_put_Prepared, + command_Execute, + command_CreateParameter, + command_get_Parameters, + command_put_CommandType, + command_get_CommandType, + command_get_Name, + command_put_Name, + command_get_State, + command_Cancel, + command_putref_CommandStream, + command_get_CommandStream, + command_put_Dialect, + command_get_Dialect, + command_put_NamedParameters, + command_get_NamedParameters +}; + +HRESULT Command_create( void **obj ) +{ + struct command *command; + + if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; + command->Command_iface.lpVtbl = &command_vtbl; + command->ref = 1; + + *obj = &command->Command_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 32ae252337..3115474b84 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -117,6 +117,7 @@ static const struct IClassFactoryVtbl msadocf_vtbl = msadocf_LockServer }; +static struct msadocf command_cf = { { &msadocf_vtbl }, Command_create }; static struct msadocf connection_cf = { { &msadocf_vtbl }, Connection_create }; static struct msadocf recordset_cf = { { &msadocf_vtbl }, Recordset_create }; static struct msadocf stream_cf = { { &msadocf_vtbl }, Stream_create }; @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) { cf = &stream_cf.IClassFactory_iface; } + else if (IsEqualGUID( clsid, &CLSID_Command )) + { + cf = &command_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, obj ); } diff --git a/dlls/msado15/msado15_classes.idl b/dlls/msado15/msado15_classes.idl index 5ede180240..51f8bd77db 100644 --- a/dlls/msado15/msado15_classes.idl +++ b/dlls/msado15/msado15_classes.idl @@ -18,6 +18,14 @@ #pragma makedep register +[ + threading(apartment), + progid("ADODB.Command.6.0"), + vi_progid("ADODB.Command"), + uuid(00000507-0000-0010-8000-00aa006d2ea4) +] +coclass Command { interface _Command; } + [ threading(apartment), progid("ADODB.Connection.6.0"), diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 7239e48b53..f6c60f0304 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -21,6 +21,7 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +HRESULT Command_create( void ** ) DECLSPEC_HIDDEN; HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 5a1813694b..03b2828d9f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -444,6 +444,32 @@ if (0) /* Crashes on windows */ _Connection_Release(connection); } +static void test_Command(void) +{ + HRESULT hr; + _Command *command; + _ADO *ado; + Command15 *command15; + Command25 *command25; + + hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Command_QueryInterface( command, &IID__ADO, (void **)&ado ); + ok( hr == S_OK, "got %08x\n", hr ); + _ADO_Release( ado ); + + hr = _Command_QueryInterface( command, &IID_Command15, (void **)&command15 ); + ok( hr == S_OK, "got %08x\n", hr ); + Command15_Release( command15 ); + + hr = _Command_QueryInterface( command, &IID_Command25, (void **)&command25 ); + ok( hr == S_OK, "got %08x\n", hr ); + Command25_Release( command25 ); + + _Command_Release( command ); +} + START_TEST(msado15) { CoInitialize( NULL ); @@ -451,5 +477,6 @@ START_TEST(msado15) test_Fields(); test_Recordset(); test_Stream(); + test_Command(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH tools] winegecko.php: Update for new file name scheme.
by Jacek Caban Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- winegecko.php | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] msado15: Add ISupportErrorInfo support to _Connection.
by Hans Leidekker Dec. 12, 2019

Dec. 12, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 56 ++++++++++++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 5 ++-- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 037ab52199..73b225628c 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,11 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { - _Connection Connection_iface; - LONG refs; - - ObjectStateEnum state; - LONG timeout; + _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -44,6 +44,11 @@ static inline struct connection *impl_from_Connection( _Connection *iface ) return CONTAINING_RECORD( iface, struct connection, Connection_iface ); } +static inline struct connection *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, ISupportErrorInfo_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -64,13 +69,18 @@ static ULONG WINAPI connection_Release( _Connection *iface ) static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid, void **obj ) { - TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; } + else if(IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &connection->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -339,12 +349,46 @@ static const struct _ConnectionVtbl connection_vtbl = connection_Cancel }; +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + return connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct connection *connection = impl_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", connection, debugstr_guid(riid) ); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; + connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 4ef4762ac6..5a1813694b 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -414,9 +414,8 @@ static void test_Connection(void) 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); + ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + ISupportErrorInfo_Release(errorinfo); if (0) /* Crashes on windows */ { -- 2.20.1

1 0

[PATCH 4/4] msvcrt: Implement sequential and random mode flags.
by Akihiro Sagawa Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] msvcrt: Implement _O_RANDOM and _O_SEQUENTIAL flags.
by Akihiro Sagawa Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4] kernelbase: Implement FILE_FLAG_SEQUENTIAL_SCAN.
by Akihiro Sagawa Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/file.c | 16 ++++++++++++++++ dlls/kernelbase/file.c | 2 ++ 2 files changed, 18 insertions(+)

1 0

[PATCH 1/4] server: Implement access pattern hints for file data.
by Akihiro Sagawa Dec. 12, 2019

Dec. 12, 2019

1 0

[PATCH] testbot/Build: Update the Gecko download URL.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 15acf6783..a8e5a0e0e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -314,8 +314,7 @@ sub _UpdateAddOn($$$) return 0; } - $AddOn->{filename} = "wine". ($Name eq "gecko" ? "_" : "-") . - "$Name-$AddOn->{version}". + $AddOn->{filename} = "wine-$Name-$AddOn->{version}". ($Arch eq "" ? "" : "-$Arch") .".msi"; return 1 if (!_VerifyAddOn($AddOn, $Arch)); -- 2.20.1

1 0

[PATCH vkd3d 1/2] vkd3d: Map the copy queue to the compute queue if necessary and possible.
by Conor McCarthy Dec. 12, 2019

Dec. 12, 2019

The current implementation maps copy to direct unless a dedicated copy queue is present. Compute queues are often more lightly loaded and there is usually more than one available. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 757d4ac..ad32ff2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1667,8 +1667,16 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, } if (info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] == ~0u) { - info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; - info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + if (info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE].queueFlags & VK_QUEUE_TRANSFER_BIT) + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE]; + } + else + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + } } /* Compact the array. */ -- 2.24.0

1 1

[PATCH] include: Add missing defines for tokens in winnt.h
by Vijay Kiran Kamuju Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/winnt.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 1db7fdd28e..56734f178d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4177,6 +4177,11 @@ typedef enum _TOKEN_INFORMATION_CLASS { MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; +#define DISABLE_MAX_PRIVILEGE 0x1 +#define SANDBOX_INERT 0x2 +#define LUA_TOKEN 0x4 +#define WRITE_RESTRICTED 0x8 + #define TOKEN_TOKEN_ADJUST_DEFAULT 0x0080 #define TOKEN_ADJUST_GROUPS 0x0040 #define TOKEN_ADJUST_PRIVILEGES 0x0020 -- 2.21.0

1 0

[PATCH] ole32/tests: Fix return value trace.
by Nikolay Sivov Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 8901758034..b97c2646bf 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1014,7 +1014,8 @@ static void test_set_clipboard(void) test_cf_dataobject(data_cmpl); test_enum_fmtetc(data_cmpl); - ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "failed to clear clipboard, hr = 0x%08x.\n", hr); test_no_cf_dataobject(); test_enum_fmtetc(NULL); -- 2.24.0

1 0

[PATCH 1/5] ole32: Fix property name handling for dictionary entries in CP_UNICODE case.
by Nikolay Sivov Dec. 12, 2019

Dec. 12, 2019

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42046 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Original patch was missing symmetric fix for serialization part. dlls/ole32/stg_prop.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 505467cad5..095bbaab94 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1195,20 +1195,25 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, ptr += sizeof(PROPID); StorageUtl_ReadDWord(ptr, 0, &cbEntry); ptr += sizeof(DWORD); - TRACE("Reading entry with ID 0x%08x, %d bytes\n", propid, cbEntry); /* Make sure the source string is NULL-terminated */ if (This->codePage != CP_UNICODE) ptr[cbEntry - 1] = '\0'; else - *((LPWSTR)ptr + cbEntry / sizeof(WCHAR)) = '\0'; + ((WCHAR *)ptr)[cbEntry - 1] = '\0'; + + TRACE("Reading entry with ID %#x, %d chars, name %s.\n", propid, cbEntry, This->codePage == CP_UNICODE ? + debugstr_wn((WCHAR *)ptr, cbEntry) : debugstr_an((char *)ptr, cbEntry)); + hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid); if (This->codePage == CP_UNICODE) { + cbEntry *= sizeof(WCHAR); + /* Unicode entries are padded to DWORD boundaries */ if (cbEntry % sizeof(DWORD)) ptr += sizeof(DWORD) - (cbEntry % sizeof(DWORD)); } - ptr += sizeof(DWORD) + cbEntry; + ptr += cbEntry; } return hr; } @@ -1753,7 +1758,7 @@ static inline HRESULT PropertyStorage_WriteWStringToStream(IStream *stm, HeapFree(GetProcessHeap(), 0, leStr); return hr; #else - return IStream_Write(stm, str, len, written); + return IStream_Write(stm, str, len * sizeof(WCHAR), written); #endif } @@ -1768,7 +1773,7 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, { PropertyStorage_impl *This = extra; struct DictionaryClosure *c = closure; - DWORD propid; + DWORD propid, keyLen; ULONG count; assert(key); @@ -1780,10 +1785,9 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, c->bytesWritten += sizeof(DWORD); if (This->codePage == CP_UNICODE) { - DWORD keyLen, pad = 0; + DWORD pad = 0, pad_len; - StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, - (lstrlenW((LPCWSTR)key) + 1) * sizeof(WCHAR)); + StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, lstrlenW((LPCWSTR)key) + 1); c->hr = IStream_Write(This->stm, &keyLen, sizeof(keyLen), &count); if (FAILED(c->hr)) goto end; @@ -1792,20 +1796,21 @@ static BOOL PropertyStorage_DictionaryWriter(const void *key, &count); if (FAILED(c->hr)) goto end; - c->bytesWritten += keyLen * sizeof(WCHAR); - if (keyLen % sizeof(DWORD)) + keyLen *= sizeof(WCHAR); + c->bytesWritten += keyLen; + + /* Align to 4 bytes. */ + pad_len = sizeof(DWORD) - keyLen % sizeof(DWORD); + if (pad_len) { - c->hr = IStream_Write(This->stm, &pad, - sizeof(DWORD) - keyLen % sizeof(DWORD), &count); + c->hr = IStream_Write(This->stm, &pad, pad_len, &count); if (FAILED(c->hr)) goto end; - c->bytesWritten += sizeof(DWORD) - keyLen % sizeof(DWORD); + c->bytesWritten += pad_len; } } else { - DWORD keyLen; - StorageUtl_WriteDWord((LPBYTE)&keyLen, 0, strlen((LPCSTR)key) + 1); c->hr = IStream_Write(This->stm, &keyLen, sizeof(keyLen), &count); if (FAILED(c->hr)) -- 2.24.0

2 6

[PATCH] shell32: Partially implement ShellLink_AddDataBlock
by Vijay Kiran Kamuju Dec. 12, 2019

Dec. 12, 2019

Wine Bug: https://bugs.winehq.org/show_bug.cgi?id=38171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shell32/shelllink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0dfb81c6e7..5831a9046e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2228,8 +2228,11 @@ ShellLink_DataList_Release( IShellLinkDataList* iface ) static HRESULT WINAPI ShellLink_AddDataBlock( IShellLinkDataList* iface, void* pDataBlock ) { - FIXME("(%p)->(%p): stub\n", iface, pDataBlock); - return E_NOTIMPL; + DATABLOCK_HEADER *hdr = (DATABLOCK_HEADER *)pDataBlock; + + FIXME("(%p)->(%p) (Size: %d - Signature: %08x): partially implemented.\n", iface, pDataBlock, hdr->cbSize, hdr->dwSignature); + + return S_OK; } static HRESULT WINAPI -- 2.21.0

1 0

[PATCH] wininet: Fix the spelling of a comment.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5e21076953e..94491689df9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3928,7 +3928,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) dwCode = ERROR_INTERNET_CANNOT_CONNECT; break; - case 426: /* Connection closed, transer aborted. */ + case 426: /* Connection closed, transfer aborted. */ dwCode = ERROR_INTERNET_CONNECTION_ABORTED; break; -- 2.20.1

2 1

[PATCH v2 1/4] kernelbase: Support PROC_THREAD_ATTRIBUTE_PARENT_PROCESS in CreateProcessInternalW().
by Paul Gofman Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - don't use INVALID_HANDLE_VALUE to return an error on zero parent. dlls/kernelbase/process.c | 88 ++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 90ea299416..d6106eb5f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename */ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info ) + RTL_USER_PROCESS_INFORMATION *info, HANDLE parent ) { NTSTATUS status; UNICODE_STRING nameW; @@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params, psa ? psa->lpSecurityDescriptor : NULL, tsa ? tsa->lpSecurityDescriptor : NULL, - 0, inherit, 0, 0, info ); + parent, inherit, 0, 0, info ); RtlFreeUnicodeString( &nameW ); } return status; @@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -368,7 +368,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW( HANDLE token, const WCHAR *a inherit, flags, env, cur_dir, startup_info, info, NULL ); } - /********************************************************************** * CreateProcessInternalA (kernelbase.@) */ @@ -382,7 +381,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * BOOL ret = FALSE; WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; + STARTUPINFOEXW infoW; desktopW.Buffer = NULL; titleW.Buffer = NULL; @@ -393,12 +392,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalA( HANDLE token, const char * if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; + memcpy( &infoW.StartupInfo, startup_info, sizeof(infoW.StartupInfo) ); + infoW.StartupInfo.lpDesktop = desktopW.Buffer; + infoW.StartupInfo.lpTitle = titleW.Buffer; + + if (flags & EXTENDED_STARTUPINFO_PRESENT) + infoW.lpAttributeList = ((STARTUPINFOEXW *)startup_info)->lpAttributeList; ret = CreateProcessInternalW( token, app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info, new_token ); + inherit, flags, env, cur_dirW, (STARTUPINFOW *)&infoW, info, new_token ); done: RtlFreeHeap( GetProcessHeap(), 0, app_nameW ); RtlFreeHeap( GetProcessHeap(), 0, cmd_lineW ); @@ -408,6 +410,22 @@ done: return ret; } +struct proc_thread_attr +{ + DWORD_PTR attr; + SIZE_T size; + void *value; +}; + +struct _PROC_THREAD_ATTRIBUTE_LIST +{ + DWORD mask; /* bitmask of items in list */ + DWORD size; /* max number of items in list */ + DWORD count; /* number of items in list */ + DWORD pad; + DWORD_PTR unk; + struct proc_thread_attr attrs[1]; +}; /********************************************************************** * CreateProcessInternalW (kernelbase.@) @@ -423,6 +441,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; RTL_USER_PROCESS_INFORMATION rtl_info; + HANDLE parent = NULL; NTSTATUS status; /* Process the AppName and/or CmdLine to get module name and path */ @@ -473,7 +492,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR goto done; } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + if (flags & EXTENDED_STARTUPINFO_PRESENT) + { + struct _PROC_THREAD_ATTRIBUTE_LIST *attrs = + (struct _PROC_THREAD_ATTRIBUTE_LIST *)((STARTUPINFOEXW *)startup_info)->lpAttributeList; + unsigned int i; + + if (attrs) + { + for (i = 0; i < attrs->count; ++i) + { + switch(attrs->attrs[i].attr) + { + case PROC_THREAD_ATTRIBUTE_PARENT_PROCESS: + parent = *(HANDLE *)attrs->attrs[i].value; + TRACE("PROC_THREAD_ATTRIBUTE_PARENT_PROCESS parent %p.\n", parent); + if (!parent) + { + status = STATUS_INVALID_HANDLE; + goto done; + } + break; + default: + FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + break; + } + } + } + } + + status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent ); switch (status) { case STATUS_SUCCESS: @@ -1301,24 +1349,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val * Process/thread attribute lists ***********************************************************************/ - -struct proc_thread_attr -{ - DWORD_PTR attr; - SIZE_T size; - void *value; -}; - -struct _PROC_THREAD_ATTRIBUTE_LIST -{ - DWORD mask; /* bitmask of items in list */ - DWORD size; /* max number of items in list */ - DWORD count; /* number of items in list */ - DWORD pad; - DWORD_PTR unk; - struct proc_thread_attr attrs[1]; -}; - /*********************************************************************** * InitializeProcThreadAttributeList (kernelbase.@) */ -- 2.23.0

3 9

[PATCH] msxml3: Fix the spelling of some comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml3/tests/saxreader.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 27abf945301..35777d65918 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -432,7 +432,7 @@ int xmlnode_get_inst_cnt(xmlnode *node) } /* _private field holds a number of COM instances spawned from this libxml2 node - * most significant bits are used to store information about ignorrable whitespace nodes */ + * most significant bits are used to store information about ignorable whitespace nodes */ void xmlnode_add_ref(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aa4c7a28321..843343aa00b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4865,7 +4865,7 @@ static void test_XPath(void) EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); - /* peform xpath tests */ + /* perform xpath tests */ for ( ; xptest->query ; xptest++ ) { char *str; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e77b00a639..44b5e1bcb5f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3172,7 +3172,7 @@ static void test_mxwriter_properties(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); SysFreeString(str); - /* test case sensivity */ + /* test case sensitivity */ hr = IMXWriter_put_encoding(writer, _bstr_("utf-8")); EXPECT_HR(hr, S_OK); str = (void*)0xdeadbeef; @@ -5639,7 +5639,7 @@ static void test_mxattr_localname(void) hr = ISAXAttributes_getIndexFromName(saxattr, NULL, 0, NULL, 0, &index); EXPECT_HR(hr, E_INVALIDARG); - /* add some ambiguos attribute names */ + /* add some ambiguous attribute names */ hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("localname"), _bstr_("a:localname"), _bstr_(""), _bstr_("value")); EXPECT_HR(hr, S_OK); -- 2.20.1

1 0

[PATCH] oleaut32: Fix the spelling of some comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/oleaut32/typelib.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 7e6398a1621..39d6fddee51 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -176,7 +176,7 @@ done: * (linked at run-time), as opposed to early-bound (linked at compile time). * * The interface is used by objects that wish to called by scripting - * languages such as VBA, in order to minimise the amount of COM and C/C++ + * languages such as VBA, in order to minimize the amount of COM and C/C++ * knowledge required, or by objects that wish to live out of process from code * that will call their methods. * diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7daf2f032ce..8a498defbc0 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5934,7 +5934,7 @@ static void test_bstr_cache(void) str = SysAllocStringLen(NULL, 24); ok(str == strs[0], "str != strs[0]\n"); - /* Smaller buffers may also use larget cached buffers */ + /* Smaller buffers may also use larger cached buffers */ str2 = SysAllocStringLen(NULL, 16); ok(str2 == strs[1], "str2 != strs[1]\n"); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 528fe6372c1..451753e23b1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4202,7 +4202,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, letter of the name, else the next WORD is an offset to the arg type and paramName points to the first letter. So let's take one char off paramName and see if we're - pointing at an alpha-numeric char. However if *pArg is + pointing at an alphanumeric char. However if *pArg is 0xffff or 0xfffe then the param has no name, the former meaning that the next WORD is the type, the latter meaning that the next WORD is an offset to the type. */ diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 71e8d080c44..9c700b11a76 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -325,7 +325,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct { -- 2.20.1

1 0

[PATCH] ntdll: Fix the spelling of some comments.
by Francois Gouget Dec. 12, 2019

Dec. 12, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a65703d6f9e..26acc066cd7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3281,7 +3281,7 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io * restart [I] restart EA scan * * RETURNS - * Success: 0. Atrributes read into buffer + * Success: 0. Attributes read into buffer * Failure: An NTSTATUS error code describing the error. */ NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 35b89df52ed..0dc6fc33900 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2143,8 +2143,8 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) * RtlTryAcquireSRWLockExclusive (NTDLL.@) * * NOTES - * Similar to AcquireSRWLockExclusive recusive calls are not allowed - * and will fail with return value FALSE. + * Similarly to AcquireSRWLockExclusive, recursive calls are not allowed + * and will fail with a FALSE return value. */ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) { -- 2.20.1

1 0