October 2021 - Wine-Devel - list.winehq.org

Re: [PATCH] include/commctrl: ListView_SetItemState should be character width agnostic

by Nikolay Sivov

On 10/31/21 6:34 PM, David Kahurani wrote: > Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> > --- > include/commctrl.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/commctrl.h b/include/commctrl.h > index 41abceb..d67f5f7 100644 > --- a/include/commctrl.h > +++ b/include/commctrl.h > @@ -3939,8 +3939,8 @@ typedef struct tagLVITEMINDEX > (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem)) > #define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem) > #define ListView_SetItemState(hwnd,i,data,dataMask) \ > -{ LVITEM _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ > - SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEM)&_LVi);} > +{ LVITEMW _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ > + SNDMSGW(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMW)&_LVi);} > #define ListView_GetItemState(hwnd,i,mask) \ > (UINT)SNDMSG((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) > #define ListView_SetCheckState(hwndLV, i, bCheck) \ This doesn't match what SDK does.

Oct. 31, 2021

[PATCH 7/7] server: use internal paths instead of /proc lookups for inotify

by Damjan Jovanovic

The inotify code uses the /proc/self/fd/<FD> symlinks to translate file descriptors to filesystem paths. This is Linux-specific and unnecessary, as we already store the paths internally, in our 'struct fd'. Use those instead, which gets the file change notifications to also work on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/change.c | 88 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 45 deletions(-)

Oct. 31, 2021

[PATCH 6/7] ntdll: populate MEMORY_WORKING_SET_EX_INFORMATION on FreeBSD

by Damjan Jovanovic

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 70 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-)

Oct. 31, 2021

[PATCH 5/7] ntdll: implement vm counters on FreeBSD

by Damjan Jovanovic

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/process.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)

Oct. 31, 2021

[PATCH 4/7] server: implement vm counters on FreeBSD

by Damjan Jovanovic

Does not regenerate ./configure or include/config.h. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 2 ++ include/config.h.in | 6 ++++++ server/Makefile.in | 2 +- server/process.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 54 insertions(+), 3 deletions(-)

Oct. 31, 2021

[PATCH 3/7] ntdll: implement get_device_mount_point() on FreeBSD

by Damjan Jovanovic

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Oct. 31, 2021

[PATCH 2/7] ntdll: implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD

by Damjan Jovanovic

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/system.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

Oct. 31, 2021

[PATCH 1/7] ntdll: implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD

by Damjan Jovanovic

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/system.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)

Oct. 31, 2021

[PATCH] include/commctrl: ListView_SetItemState should be character width agnostic

by David Kahurani

Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- include/commctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 41abceb..d67f5f7 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3939,8 +3939,8 @@ typedef struct tagLVITEMINDEX (INT)SNDMSGW((hwnd),LVM_SETITEMW,0,(LPARAM)(const LVITEMW *)(pitem)) #define ListView_SetItem WINELIB_NAME_AW(ListView_SetItem) #define ListView_SetItemState(hwnd,i,data,dataMask) \ -{ LVITEM _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ - SNDMSG(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEM)&_LVi);} +{ LVITEMW _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ + SNDMSGW(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMW)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (UINT)SNDMSG((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) #define ListView_SetCheckState(hwndLV, i, bCheck) \ -- 2.25.1

Oct. 31, 2021

[PATCH 5/5] msdasql: Return valid object from ICommandText Execute.

by Alistair Leslie-Hughes

Until we query ODBC, we aren't able workout if we need a recordset or not. As a start, always return an interface, this way we can add the required interface for a rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 127 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 41 +++++++++++ 2 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 8b96620cc41..61be9e8505f 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -409,12 +409,135 @@ static HRESULT WINAPI command_Cancel(ICommandText *iface) return E_NOTIMPL; } +struct msdasql_rowset +{ + IRowset IRowset_iface; + LONG refs; +}; + +static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowset_iface ); +} + +static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + + TRACE( "%p, %s, %p\n", rowset, debugstr_guid(riid), ppv ); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IRowset, riid)) + { + *ppv = &rowset->IRowset_iface; + } + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI msdasql_rowset_AddRef(IRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + LONG refs = InterlockedIncrement( &rowset->refs ); + TRACE( "%p new refcount %d\n", rowset, refs ); + return refs; +} + +static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + LONG refs = InterlockedDecrement( &rowset->refs ); + TRACE( "%p new refcount %d\n", rowset, refs ); + if (!refs) + { + TRACE( "destroying %p\n", rowset ); + heap_free( rowset ); + } + return refs; +} + +static HRESULT WINAPI msdasql_rowset_AddRefRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, rows, ref_counts, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_GetData(IRowset *iface, HROW row, HACCESSOR accessor, void *data) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %ld, %p\n", rowset, row, accessor, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_GetNextRows(IRowset *iface, HCHAPTER reserved, DBROWOFFSET offset, + DBROWCOUNT count, DBCOUNTITEM *obtained, HROW **rows) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld, %ld, %ld, %p, %p\n", rowset, reserved, offset, count, obtained, rows); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM count, + const HROW rows[], DBROWOPTIONS options[], DBREFCOUNT ref_counts[], DBROWSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + + FIXME("%p, %ld, %p, %p, %p, %p\n", rowset, count, rows, options, ref_counts, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI msdasql_rowset_RestartPosition(IRowset *iface, HCHAPTER reserved) +{ + struct msdasql_rowset *rowset = impl_from_IRowset( iface ); + FIXME("%p, %ld\n", rowset, reserved); + return E_NOTIMPL; +} + +static const struct IRowsetVtbl msdasql_rowset_vtbl = +{ + msdasql_rowset_QueryInterface, + msdasql_rowset_AddRef, + msdasql_rowset_Release, + msdasql_rowset_AddRefRows, + msdasql_rowset_GetData, + msdasql_rowset_GetNextRows, + msdasql_rowset_ReleaseRows, + msdasql_rowset_RestartPosition +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); - return E_NOTIMPL; + struct msdasql_rowset *msrowset; + HRESULT hr; + + FIXME("%p, %p, %s, %p %p %p Semi Stub\n", command, outer, debugstr_guid(riid), params, affected, rowset); + + msrowset = heap_alloc(sizeof(*msrowset)); + if (!msrowset) + return E_OUTOFMEMORY; + + msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->refs = 1; + + if (affected) + *affected = 0; /* FIXME */ + + hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&msrowset->IRowset_iface); + + return hr; } static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 35dfeb10d3d..df642a6a637 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -222,6 +222,46 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } +static void test_command_rowset(IUnknown *cmd) +{ + ICommandText *comand_text; + HRESULT hr; + IUnknown *unk = NULL; + IRowset *rowset; + DBROWCOUNT affected; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + affected = 9999; + hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(affected == -1, "got %ld\n", affected); + if (unk) + IUnknown_Release(unk); + + affected = 9999; + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK && unk) + { + ok(affected == 0, "wrong affected value\n"); + + hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IRowset_Release(rowset); + IUnknown_Release(unk); + } + + ICommandText_Release(comand_text); +} + + static void test_sessions(void) { IDBProperties *props; @@ -298,6 +338,7 @@ static void test_sessions(void) test_command_interfaces(cmd); test_command_text(cmd); test_command_dbsession(cmd, session); + test_command_rowset(cmd); IUnknown_Release(cmd); } -- 2.33.0

Oct. 31, 2021