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

[PATCH 7/7] server: use internal paths instead of /proc lookups for inotify
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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(-)

1 0

[PATCH 6/7] ntdll: populate MEMORY_WORKING_SET_EX_INFORMATION on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 5/7] ntdll: implement vm counters on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 4/7] server: implement vm counters on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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(-)

1 0

[PATCH 3/7] ntdll: implement get_device_mount_point() on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 2/7] ntdll: implement setting SYSTEM_PERFORMANCE_INFORMATION.IdleTime on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 1/7] ntdll: implement setting SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION.IdleTime on FreeBSD
by Damjan Jovanovic 31 Oct '21

31 Oct '21

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

1 0

[PATCH 5/5] msdasql: Return valid object from ICommandText Execute.
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

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

1 0

[PATCH 4/5] msdasql: Implement ICommandText GetDBSession
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 19 +++++++++++++++++-- dlls/msdasql/tests/provider.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index c0deb32d8ad..8b96620cc41 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -285,6 +285,7 @@ struct command ICommandPrepare ICommandPrepare_iface; LONG refs; WCHAR *query; + IUnknown *session; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -393,6 +394,8 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); + if (command->session) + IUnknown_Release(command->session); heap_free( command->query ); heap_free( command ); } @@ -417,8 +420,18 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUnknown **session) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %s, %p\n", command, debugstr_guid(riid), session); - return E_NOTIMPL; + + TRACE("%p, %s, %p\n", command, debugstr_guid(riid), session); + + if (!session) + return E_INVALIDARG; + + *session = NULL; + + if (!command->session) + return S_FALSE; + + return IUnknown_QueryInterface(command->session, riid, (void**)session);; } static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) @@ -656,6 +669,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; + IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); + hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); ICommandText_Release(&command->ICommandText_iface); return hr; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 09a4b69c31d..35dfeb10d3d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -206,6 +206,22 @@ if (0) ICommandText_Release(comand_text); } +static void test_command_dbsession(IUnknown *cmd, IUnknown *session) +{ + ICommandText *comand_text; + HRESULT hr; + IUnknown *sess; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(session == sess, "different session pointers\n"); + + ICommandText_Release(comand_text); +} + static void test_sessions(void) { IDBProperties *props; @@ -281,6 +297,7 @@ static void test_sessions(void) { test_command_interfaces(cmd); test_command_text(cmd); + test_command_dbsession(cmd, session); IUnknown_Release(cmd); } -- 2.33.0

1 0

[PATCH 3/5] msdasql: Implement ICommandText Get/Set CommandText
by Alistair Leslie-Hughes 31 Oct '21

31 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 ++ dlls/msdasql/session.c | 35 +++++++++++++++++++++--- dlls/msdasql/tests/provider.c | 50 +++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 79feacb83aa..a2d40e14b96 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index da148fd7ca6..c0deb32d8ad 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "msdasql.h" +#include "oledberr.h" #include "msdasql_private.h" @@ -283,6 +284,7 @@ struct command IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; LONG refs; + WCHAR *query; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -391,6 +393,7 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); + heap_free( command->query ); heap_free( command ); } return refs; @@ -421,14 +424,40 @@ static HRESULT WINAPI command_GetDBSession(ICommandText *iface, REFIID riid, IUn static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, LPOLESTR *commandstr) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %p, %p\n", command, dialect, commandstr); - return E_NOTIMPL; + HRESULT hr = S_OK; + TRACE("%p, %p, %p\n", command, dialect, commandstr); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + hr = DB_S_DIALECTIGNORED; + + *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); + wcscpy(*commandstr, command->query); + return hr; } static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialect, LPCOLESTR commandstr) { struct command *command = impl_from_ICommandText( iface ); - FIXME("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); + + if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + FIXME("Currently non Default Dialect isn't supported\n"); + + heap_free(command->query); + + if (commandstr) + { + command->query = heap_alloc((lstrlenW(commandstr)+1)*sizeof(WCHAR)); + if (!command->query) + return E_OUTOFMEMORY; + + wcscpy(command->query, commandstr); + } + else + command->query = NULL; return S_OK; } diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index bb624bd9848..09a4b69c31d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -27,12 +27,15 @@ #include "initguid.h" #include "msdasql.h" +#include "oledberr.h" #include "wine/test.h" DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -157,6 +160,52 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } +static void test_command_text(IUnknown *cmd) +{ + ICommandText *comand_text; + HRESULT hr; + OLECHAR *str; + GUID dialect; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + +if (0) +{ + /* Crashes under windows */ + hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* dialect empty value */ + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); + ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + + dialect = DBGUID_DEFAULT; + hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + + ICommandText_Release(comand_text); +} + static void test_sessions(void) { IDBProperties *props; @@ -231,6 +280,7 @@ static void test_sessions(void) if (hr == S_OK) { test_command_interfaces(cmd); + test_command_text(cmd); IUnknown_Release(cmd); } -- 2.33.0

1 0