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

[PATCH 4/5] msdasql: Add IColumnsInfo interface for ICommandText
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 54 +++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85e79e00108..eabdcacc968 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -279,6 +279,7 @@ struct command { ICommandText ICommandText_iface; ICommandProperties ICommandProperties_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -292,6 +293,11 @@ static inline struct command *impl_from_ICommandProperties( ICommandProperties * return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); } +static inline struct command *impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct command, IColumnsInfo_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -309,6 +315,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandProperties_iface; } + else if(IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &command->IColumnsInfo_iface; + } if(*ppv) { @@ -457,6 +467,49 @@ static const ICommandPropertiesVtbl commonpropsVtbl = command_prop_SetProperties }; +static HRESULT WINAPI colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI colsinfo_AddRef(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI colsinfo_Release(IColumnsInfo *iface) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", command, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct command *command = impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", command, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl columninfoVtbl = +{ + colsinfo_QueryInterface, + colsinfo_AddRef, + colsinfo_Release, + colsinfo_GetColumnInfo, + colsinfo_MapColumnIDs +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -475,6 +528,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandText_iface.lpVtbl = &commandVtbl; command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; + command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 184e5d3b1e8..d4c6930bc8e 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -140,9 +140,8 @@ static void test_command_interfaces(IUnknown *cmd) ICommandPrepare_Release(commandprepare); hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - IColumnsInfo_Release(colinfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(colinfo); hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); -- 2.33.0

1 0

[PATCH 3/5] msdasql: Trace unsupported interfaces.
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 25 +++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 42b40349f1b..85e79e00108 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -315,6 +315,31 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + else if (IsEqualGUID(&IID_IMultipleResults, riid)) + { + TRACE("IID_IMultipleResults not supported\n"); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICommandStream, riid)) + { + TRACE("ICommandStream not support\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 0d9630070b3..184e5d3b1e8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -119,6 +119,7 @@ static void test_command_interfaces(IUnknown *cmd) ICommandStream *commandstream; IColumnsInfo *colinfo; IMultipleResults *multiple; + IUnknown *unk; hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -148,6 +149,15 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_sessions(void) -- 2.33.0

1 0

[PATCH 2/5] msdasql: Add ICommandProperties interface to ICommandText
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index afdbccb5a03..42b40349f1b 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -278,6 +278,7 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) struct command { ICommandText ICommandText_iface; + ICommandProperties ICommandProperties_iface; LONG refs; }; @@ -286,6 +287,11 @@ static inline struct command *impl_from_ICommandText( ICommandText *iface ) return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); } +static inline struct command *impl_from_ICommandProperties( ICommandProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandProperties_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -299,6 +305,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandText_iface; } + else if(IsEqualGUID(&IID_ICommandProperties, riid)) + { + *ppv = &command->ICommandProperties_iface; + } if(*ppv) { @@ -379,6 +389,49 @@ static const ICommandTextVtbl commandVtbl = command_SetCommandText }; +static HRESULT WINAPI command_prop_QueryInterface(ICommandProperties *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI command_prop_AddRef(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI command_prop_Release(ICommandProperties *iface) +{ + struct command *command = impl_from_ICommandProperties( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, + DBPROPSET propertyset[]) +{ + struct command *command = impl_from_ICommandProperties( iface ); + FIXME("%p %p\n", command, propertyset); + return S_OK; +} + +static const ICommandPropertiesVtbl commonpropsVtbl = +{ + command_prop_QueryInterface, + command_prop_AddRef, + command_prop_Release, + command_prop_GetProperties, + command_prop_SetProperties +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -396,6 +449,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn return E_OUTOFMEMORY; command->ICommandText_iface.lpVtbl = &commandVtbl; + command->ICommandProperties_iface.lpVtbl = &commonpropsVtbl; command->refs = 1; hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); -- 2.33.0

1 0

[PATCH 1/5] msdasql: Implement IDBCreateCommand CreateCommand
by Alistair Leslie-Hughes 29 Oct '21

29 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 123 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e01dcf7ab7e..afdbccb5a03 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -275,13 +275,132 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) return IUnknown_Release(&session->session_iface); } +struct command +{ + ICommandText ICommandText_iface; + LONG refs; +}; + +static inline struct command *impl_from_ICommandText( ICommandText *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandText_iface ); +} + +static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) +{ + struct command *command = impl_from_ICommandText( iface ); + + TRACE( "%p, %s, %p\n", command, debugstr_guid(riid), ppv ); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_ICommand, riid) || + IsEqualGUID(&IID_ICommandText, riid)) + { + *ppv = &command->ICommandText_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 command_AddRef(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedIncrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + return refs; +} + +static ULONG WINAPI command_Release(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + LONG refs = InterlockedDecrement( &command->refs ); + TRACE( "%p new refcount %d\n", command, refs ); + if (!refs) + { + TRACE( "destroying %p\n", command ); + heap_free( command ); + } + return refs; +} + +static HRESULT WINAPI command_Cancel(ICommandText *iface) +{ + struct command *command = impl_from_ICommandText( iface ); + FIXME("%p\n", command); + return E_NOTIMPL; +} + +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; +} + +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; +} + +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; +} + +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)); + return S_OK; +} + +static const ICommandTextVtbl commandVtbl = +{ + command_QueryInterface, + command_AddRef, + command_Release, + command_Cancel, + command_Execute, + command_GetDBSession, + command_GetCommandText, + command_SetCommandText +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); - FIXME("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + struct command *command; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + if (outer) + FIXME("Outer not currently supported\n"); + + command = heap_alloc(sizeof(*command)); + if (!command) + return E_OUTOFMEMORY; + + command->ICommandText_iface.lpVtbl = &commandVtbl; + command->refs = 1; + + hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); + ICommandText_Release(&command->ICommandText_iface); + return hr; } static const IDBCreateCommandVtbl createcommandVtbl = -- 2.33.0

1 0

[PATCH v5 1/2] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick Fox 29 Oct '21

29 Oct '21

Add tests for various paths and undefined behavior with regards to LdrGetDllPath with LOAD_ALTERED_SEARCH_PATH and relative module names. Also update the build_search_path helper function to correctly build the search path when LOAD_WITH_ALTERED_SEARCH_PATH is set. Signed-off-by: Nick Fox <nick(a)foxsec.net> --- v5: use helper function to duplicate less code per julliard's feedback --- dlls/kernel32/tests/path.c | 93 +++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..2737910931c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2409,12 +2409,16 @@ static void test_SetSearchPathMode(void) static const WCHAR pathW[] = {'P','A','T','H',0}; -static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe ) +static void build_search_path( const WCHAR *path, WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe, ULONG flags ) { WCHAR *p; - GetModuleFileNameW( NULL, buffer, size ); - if (!(p = wcsrchr( buffer, '\\' ))) return; + if (path && (flags & LOAD_WITH_ALTERED_SEARCH_PATH) && (p = wcsrchr( path, L'\\' ))) + lstrcpynW( buffer, path, p - path + 2 ); + else + GetModuleFileNameW( NULL, buffer, size ); + if (!(p = wcsrchr( buffer, L'\\' ))) return; *p++ = ';'; + if (dlldir) { lstrcpyW( p, dlldir ); @@ -2471,7 +2475,7 @@ static void test_RtlGetSearchPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2479,7 +2483,7 @@ static void test_RtlGetSearchPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2489,7 +2493,7 @@ static void test_RtlGetSearchPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2520,14 +2524,14 @@ static void test_RtlGetExePath(void) lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", NULL ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2536,14 +2540,14 @@ static void test_RtlGetExePath(void) SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", "yes" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), emptyW, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), emptyW, TRUE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2551,7 +2555,7 @@ static void test_RtlGetExePath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2561,7 +2565,7 @@ static void test_RtlGetExePath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, FALSE, 0 ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2578,7 +2582,7 @@ static void test_LdrGetDllPath(void) static const WCHAR fooW[] = {'f','o','o',0}; NTSTATUS ret; WCHAR *path, *unknown_ptr, *p; - WCHAR buffer[2048], old_path[2048], dlldir[4]; + WCHAR buffer[2048], old_path[2048], module_path[2048], dlldir[4]; if (!pLdrGetDllPath) { @@ -2589,7 +2593,7 @@ static void test_LdrGetDllPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); path = unknown_ptr = (WCHAR *)0xdeadbeef; ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); @@ -2599,7 +2603,7 @@ static void test_LdrGetDllPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), NULL, TRUE, 0 ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2609,7 +2613,7 @@ static void test_LdrGetDllPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), dlldir, TRUE ); + build_search_path( NULL, buffer, ARRAY_SIZE(buffer), dlldir, TRUE, 0 ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2654,6 +2658,63 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + lstrcpyW( module_path, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"temp" ); + p = module_path + lstrlenW( module_path ); + *p++ = '/'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L".\\foo\\foobar" ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"temp" ); + p = module_path + lstrlenW( module_path ); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE,LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( module_path, L"c:\\temp" ); + p = module_path + lstrlenW(module_path); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( module_path, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( module_path, buffer, ARRAY_SIZE(buffer), NULL, TRUE, LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; -- 2.33.1

2 2

[PATCH 1/6] user32/tests: Cleanup and rewrite test_EnumDisplayDevices.
by Rémi Bernon 28 Oct '21

28 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- A refresh and continuation of the null graphics driver improvements, as I've finally been able to make all monitor tests (and thus all user32 tests) to pass with it too, without duplicating the driver adapter and monitor initialization code and initializing the device cache with some defaults instead. dlls/user32/tests/monitor.c | 230 ++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 127 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..131721d7ec1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,148 +105,124 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static int adapter_count = 0; -static int monitor_count = 0; - -static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) +static void test_EnumDisplayDevices(void) { - char buffer[128]; - int number; - int vendor_id; - int device_id; - int subsys_id; - int revision_id; + DISPLAY_DEVICEW dd = {.cb = sizeof(DISPLAY_DEVICEW)}, adapter = dd, adapter_iface = dd, monitor = dd, monitor_iface = dd; + DWORD number, monitor_num, adapter_index, monitor_index, adapter_count = 0, monitor_count = 0; + WCHAR buffer[MAX_PATH], monitor_id[MAX_PATH]; + BOOL ret; HDC hdc; - adapter_count++; - - /* DeviceName */ - ok(sscanf(device->DeviceName, "\\\\.\\DISPLAY%d", &number) == 1, "#%d: wrong DeviceName %s\n", index, - device->DeviceName); - - /* DeviceKey */ - /* \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not necessarily in order with adapter index. - * Check format only */ - ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); - - /* DeviceString */ - ok(broken(!*device->DeviceString) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ - *device->DeviceString, "#%d: expect DeviceString not empty\n", index); + /* Doesn't accept \\.\DISPLAY */ + dd.cb = sizeof(dd); + ret = EnumDisplayDevicesW( L"\\\\.\\DISPLAY", 0, &dd, 0 ); + ok( !ret, "EnumDisplayDevicesW succeeded\n" ); - /* StateFlags */ - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + adapter_index = -1; + while (EnumDisplayDevicesW( NULL, ++adapter_index, &adapter, 0 )) { - /* Test creating DC */ - hdc = CreateDCA(device->DeviceName, NULL, NULL, NULL); - ok(hdc != NULL, "#%d: failed to CreateDC(\"%s\") err=%d\n", index, device->DeviceName, GetLastError()); - DeleteDC(hdc); - } + winetest_push_context( "adapter %u", adapter_index ); - /* DeviceID */ - /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this - * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on - * userland. So here we check the expected format instead. */ - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - ok(strlen(device->DeviceID) == 0 || /* vista+ */ - sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", - &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: got %s\n", index, device->DeviceID); - else - { - ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ - sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, - &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); - } -} + ret = EnumDisplayDevicesW( NULL, adapter_index, &adapter_iface, EDD_GET_DEVICE_INTERFACE_NAME ); + ok( ret, "EnumDisplayDevicesW failed, error %u\n", GetLastError() ); -static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, - DISPLAY_DEVICEA *device, DWORD flags) -{ - static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" - "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; - char monitor_name[32]; - char buffer[128]; - int number; - - monitor_count++; - - /* DeviceName */ - lstrcpyA(monitor_name, adapter_name); - sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); - - /* DeviceString */ - ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); - - /* StateFlags */ - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), - "#%d wrong state %#x\n", monitor_index, device->StateFlags); - - /* DeviceID */ - CharLowerA(device->DeviceID); - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\[instance id] GUID_DEVINTERFACE_MONITOR - * ^ ^ ^ - * Expect format \\?\DISPLAY#[monitor name]#[instance id]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ - sscanf(device->DeviceID, "\\\\?\\display#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer, buffer) == 2 || /* win8+ */ - sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); - } - else - { - /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\{instance} */ - /* But we don't know which monitor instance this belongs to, so check format instead */ - ok(sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); - } + ok( !wcscmp( adapter.DeviceName, adapter_iface.DeviceName ), "got DeviceName %s expected %s\n", + debugstr_w(adapter.DeviceName), debugstr_w(adapter_iface.DeviceName) ); + ok( !wcscmp( adapter.DeviceString, adapter_iface.DeviceString ), "got DeviceString %s expected %s\n", + debugstr_w(adapter.DeviceString), debugstr_w(adapter_iface.DeviceString) ); + ok( adapter.StateFlags == adapter_iface.StateFlags, "got StateFlags %#x expected %#x\n", + adapter.StateFlags, adapter_iface.StateFlags ); + ok( !wcscmp( adapter.DeviceKey, adapter_iface.DeviceKey ), "got DeviceKey %s expected %s\n", + debugstr_w(adapter.DeviceKey), debugstr_w(adapter_iface.DeviceKey) ); - /* DeviceKey */ - lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); - ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); - ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); -} - -static void test_enumdisplaydevices(void) -{ - static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; - DISPLAY_DEVICEA dd; - char adapter_name[32]; - int number; - int flag_index; - int adapter_index; - int monitor_index; - BOOL ret; + if (swscanf( adapter.DeviceName, L"\\\\.\\DISPLAYV%u", &number ) == 1) + { + skip( "Skipping software devices %s %s\n", debugstr_w(adapter.DeviceName), debugstr_w(adapter.DeviceString) ); + winetest_pop_context(); + continue; + } - /* Doesn't accept \\.\DISPLAY */ - dd.cb = sizeof(dd); - ret = EnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - ok(!ret, "Expect failure\n"); + swprintf( buffer, MAX_PATH, L"\\\\.\\DISPLAY%u", adapter_count + 1 ); + ok( !wcscmp( adapter.DeviceName, buffer ), "got DeviceName %s expected %s\n", + debugstr_w(adapter.DeviceName), debugstr_w(buffer) ); - /* Enumeration */ - for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) - for (adapter_index = 0; EnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) + ok( *adapter.DeviceString, "got empty DeviceString\n" ); + if (adapter.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { - lstrcpyA(adapter_name, dd.DeviceName); - - if (sscanf(adapter_name, "\\\\.\\DISPLAYV%d", &number) == 1) - { - skip("Skipping software devices %s:%s\n", adapter_name, dd.DeviceString); - continue; - } + /* Test creating DC */ + hdc = CreateDCW( adapter.DeviceName, NULL, NULL, NULL ); + ok( hdc != 0, "CreateDCW failed error %u\n", GetLastError() ); + DeleteDC( hdc ); + } - test_enumdisplaydevices_adapter(adapter_index, &dd, flags[flag_index]); + ok( swscanf( adapter.DeviceKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\" + "Video\\%[^\\]\\%04u", buffer, &number ) == 2, + "got DeviceKey %s\n", debugstr_w(adapter.DeviceKey) ); - for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); - monitor_index++) - test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); + /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this + * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on + * userland. So here we check the expected format instead. */ + todo_wine + ok( broken( !*adapter_iface.DeviceID ) || + swscanf( adapter_iface.DeviceID, L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", + &number, &number, &number, &number ) == 4, + "got interface DeviceID %s\n", debugstr_w(adapter_iface.DeviceID) ); + ok( swscanf( adapter.DeviceID, L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &number, + &number, &number, &number ) == 4, + "got interface DeviceID %s\n", debugstr_w(adapter.DeviceID) ); + + monitor_index = -1; + while (EnumDisplayDevicesW( adapter.DeviceName, ++monitor_index, &monitor, 0 )) + { + winetest_push_context( "monitor %u", monitor_index ); + + ret = EnumDisplayDevicesW( adapter.DeviceName, monitor_index, &monitor_iface, EDD_GET_DEVICE_INTERFACE_NAME ); + ok( ret, "EnumDisplayDevicesW failed, error %u\n", GetLastError() ); + + ok( !wcscmp( monitor.DeviceName, monitor_iface.DeviceName ), "got DeviceName %s expected %s\n", + debugstr_w(monitor.DeviceName), debugstr_w(monitor_iface.DeviceName) ); + ok( !wcscmp( monitor.DeviceString, monitor_iface.DeviceString ), "got DeviceString %s expected %s\n", + debugstr_w(monitor.DeviceString), debugstr_w(monitor_iface.DeviceString) ); + ok( monitor.StateFlags == monitor_iface.StateFlags, "got StateFlags %#x expected %#x\n", + monitor.StateFlags, monitor_iface.StateFlags ); + ok( !wcscmp( monitor.DeviceKey, monitor_iface.DeviceKey ), "got DeviceKey %s expected %s\n", + debugstr_w(monitor.DeviceKey), debugstr_w(monitor_iface.DeviceKey) ); + + swprintf( buffer, MAX_PATH, L"%s\\Monitor%u", adapter.DeviceName, monitor_index ); + ok( !wcscmp( monitor.DeviceName, buffer ), "got DeviceName %s expected %s\n", + debugstr_w(monitor.DeviceName), debugstr_w(buffer) ); + + ok( *monitor.DeviceString, "got empty DeviceString\n" ); + ok( !(monitor.StateFlags & ~(DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE)), + "got unexpected StateFlags %#x\n", monitor.StateFlags ); + + CharLowerW( monitor.DeviceKey ); + ok( swscanf( monitor.DeviceKey, L"\\registry\\machine\\system\\currentcontrolset\\control\\" + "class\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04u", &monitor_num ) == 1, + "got DeviceKey %s\n", debugstr_w(monitor.DeviceKey) ); + + ok( broken( !*monitor_iface.DeviceID ) || + swscanf( monitor_iface.DeviceID, L"\\\\?\\DISPLAY#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", + monitor_id, buffer ) == 2, + "got interface DeviceID %s\n", debugstr_w(monitor_iface.DeviceID) ); + if (!*monitor_iface.DeviceID) wcscpy( monitor_id, L"default_monitor" ); + + swprintf( buffer, MAX_PATH, L"monitor\\%s\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04u", + monitor_id, monitor_num ); + ok( !wcsicmp( monitor.DeviceID, buffer ), "got DeviceID %s expected %s\n", + debugstr_w(monitor.DeviceID), debugstr_w(buffer) ); + + winetest_pop_context(); } - ok(adapter_count > 0, "Expect at least one adapter found\n"); + adapter_count += 1; + monitor_count += monitor_index; + winetest_pop_context(); + } + + ok( adapter_index > 0, "Expect at least one adapter found\n" ); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ - ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); + ok( broken( monitor_count == 0 ) || monitor_count > 0, "Expect at least one monitor found\n" ); } struct vid_mode @@ -2356,7 +2332,7 @@ static void test_display_dc(void) START_TEST(monitor) { init_function_pointers(); - test_enumdisplaydevices(); + test_EnumDisplayDevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo(); test_EnumDisplayMonitors(); -- 2.33.0

3 9

[PATCH v2 6/6] secur32/tests: Add DTLS tests.
by Hans Leidekker 28 Oct '21

28 Oct '21

v2: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 71 +++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b7f9d409d41..7cb3871193c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1517,6 +1517,76 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void test_dtls(void) +{ + SECURITY_STATUS status; + TimeStamp exp; + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle ctx_handle; + SecBufferDesc buffers[3]; + ULONG flags_req, flags_ret, attr; + + init_cred( &cred ); + cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS; + + status = AcquireCredentialsHandleA( NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, + &cred_handle, &exp ); + if (status == SEC_E_ALGORITHM_MISMATCH) + { + win_skip( "no DTLS support\n" ); + return; + } + ok( status == SEC_E_OK, "got %08x\n", status ); + + flags_req = ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_EXTENDED_ERROR | ISC_REQ_DATAGRAM | ISC_REQ_USE_SUPPLIED_CREDS | + ISC_REQ_CONFIDENTIALITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT; + + init_buffers( &buffers[0], 1, 128 ); + buffers[0].pBuffers[0].BufferType = SECBUFFER_DTLS_MTU; + *(WORD *)(buffers[0].pBuffers[0].pvBuffer) = 1024; + buffers[0].pBuffers[0].cbBuffer = 2; + + init_buffers( &buffers[1], 2, 2048 ); + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; + buffers[1].pBuffers[1].cbBuffer = 1024; + buffers[1].pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, NULL, (SEC_CHAR *)"winetest", flags_req, 0, 16, &buffers[0], 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); + + flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + free_buffers( &buffers[0] ); + free_buffers( &buffers[1] ); + DeleteSecurityContext( &ctx_handle ); + FreeCredentialsHandle( &cred_handle ); +} + START_TEST(schannel) { WSADATA wsa_data; @@ -1529,4 +1599,5 @@ START_TEST(schannel) test_InitializeSecurityContext(); test_communication(); test_application_protocol_negotiation(); + test_dtls(); } -- 2.30.2

2 1

[PATCH v2 1/3] uiautomationcore: Implement UiaGetReservedNotSupportedValue.
by Connor McAdams 28 Oct '21

28 Oct '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 147 +++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..5a72ea144c4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = uuid ole32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..51c220c6041 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,12 +16,150 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); +struct uia_rsrv_ftmarshaler +{ + IUnknown IUnknown_iface; + LONG refcount; + + IUnknown *inner; + IUnknown *rsrv_val; +}; + +static struct uia_rsrv_ftmarshaler *uia_rsrv_ns_val_ftmarshaler = NULL; + +static struct uia_rsrv_ftmarshaler *impl_uia_rsrv_ftmarshaler_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct uia_rsrv_ftmarshaler, IUnknown_iface); +} + +static HRESULT WINAPI uia_rsrv_ftmarshaler_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + + return IUnknown_QueryInterface(marshaler->rsrv_val, riid, ppv); +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_AddRef(IUnknown *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&marshaler->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI uia_rsrv_ftmarshaler_Release(IUnknown *iface) +{ + struct uia_rsrv_ftmarshaler *marshaler = impl_uia_rsrv_ftmarshaler_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&marshaler->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + if (!refcount) + { + if (marshaler == uia_rsrv_ns_val_ftmarshaler) + uia_rsrv_ns_val_ftmarshaler = NULL; + + IUnknown_Release(marshaler->inner); + heap_free(marshaler); + } + + return refcount; +} + +static const IUnknownVtbl uia_rsrv_ftmarshaler_vtbl = { + uia_rsrv_ftmarshaler_QueryInterface, + uia_rsrv_ftmarshaler_AddRef, + uia_rsrv_ftmarshaler_Release, +}; + +/* + * When passing the ReservedNotSupportedValue/ReservedMixedAttributeValue + * interface pointers across apartments within the same process, create a free + * threaded marshaler so that the pointer value is preserved. + */ +static HRESULT uia_rsrv_val_create_ftmarshaler(IUnknown *reserved, struct uia_rsrv_ftmarshaler **marshaler) +{ + struct uia_rsrv_ftmarshaler *object; + HRESULT hr; + + TRACE("%p, %p\n", reserved, marshaler); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IUnknown_iface.lpVtbl = &uia_rsrv_ftmarshaler_vtbl; + object->refcount = 1; + + hr = CoCreateFreeThreadedMarshaler(&object->IUnknown_iface, &object->inner); + if (FAILED(hr = CoCreateFreeThreadedMarshaler(&object->IUnknown_iface, &object->inner))) + { + heap_free(object); + return hr; + } + + *marshaler = object; + + return hr; +} + +/* + * UiaReservedNotSupported object. + */ +static HRESULT WINAPI uia_reserved_ns_QueryInterface(IUnknown *iface, + REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) + { + if (!uia_rsrv_ns_val_ftmarshaler) + { + if (FAILED(uia_rsrv_val_create_ftmarshaler(iface, &uia_rsrv_ns_val_ftmarshaler))) + return E_NOINTERFACE; + } + + if (FAILED(IUnknown_QueryInterface(uia_rsrv_ns_val_ftmarshaler->inner, riid, ppv))) + return E_NOINTERFACE; + + IUnknown_Release(&uia_rsrv_ns_val_ftmarshaler->IUnknown_iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI uia_reserved_ns_AddRef(IUnknown *iface) +{ + return 1; +} + +static ULONG WINAPI uia_reserved_ns_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl uia_reserved_ns_vtbl = { + uia_reserved_ns_QueryInterface, + uia_reserved_ns_AddRef, + uia_reserved_ns_Release, +}; + +static IUnknown uia_reserved_ns_iface = {&uia_reserved_ns_vtbl}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -46,8 +184,13 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) */ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value) { - FIXME("(%p) stub!\n", value); - *value = NULL; + TRACE("(%p)\n", value); + + if (!value) + return E_INVALIDARG; + + *value = &uia_reserved_ns_iface; + return S_OK; } -- 2.25.1

2 4

[PATCH v2 5/6] secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b1a910a361..895364a3fc7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -880,6 +880,11 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return ctx->header_size == HEADER_SIZE_DTLS; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -985,35 +990,28 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (pInput) - { - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; - - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - while (buffer->cbBuffer > expected_size + ctx->header_size) - { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - if (buffer->cbBuffer < expected_size + record_size) - break; + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - expected_size += record_size; - ptr += record_size; - } + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; } - else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } -- 2.30.2

1 0

[PATCH v2 4/6] secur32: Validate the context handle in schan_InitializeSecurityContextW().
by Hans Leidekker 28 Oct '21

28 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fdf8e990f62..5b1a910a361 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -984,7 +984,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( SIZE_T record_size = 0; unsigned char *ptr; - ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); + if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; if (pInput) { idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); -- 2.30.2

1 0