October 2021 - Wine-commits

Alistair Leslie-Hughes : msdasql: Implement MSDASQL provider.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 00d2ca25b0b161570cea54d7d2cb4f977a5a22fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d2ca25b0b161570cea54d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:31 2021 +1100 msdasql: Implement MSDASQL provider. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 105 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 97 insertions(+), 8 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index c3c54ba2606..91978ad9c1a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -64,11 +64,13 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) return 1; } -HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_msdasql_provider(REFIID riid, void **ppv); + +HRESULT WINAPI msdasql_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + return create_msdasql_provider(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) @@ -77,18 +79,105 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return S_OK; } -static const IClassFactoryVtbl cffactoryVtbl = { +static const IClassFactoryVtbl cfmsdasqlVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, - ClassFactory_CreateInstance, + msdasql_CreateInstance, ClassFactory_LockServer }; -static IClassFactory cffactory = { &cffactoryVtbl }; +static IClassFactory cfmsdasql = { &cfmsdasqlVtbl }; HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&cffactory, riid, ppv); + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (IsEqualGUID(&CLSID_MSDASQL, rclsid)) + return IClassFactory_QueryInterface(&cfmsdasql, riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +struct msdasql +{ + IUnknown MSDASQL_iface; + + LONG ref; +}; + +static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); +} + +static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", provider, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &CLSID_MSDASQL)) + { + *out = &provider->MSDASQL_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI msdsql_AddRef(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + return ref; +} + +static ULONG WINAPI msdsql_Release(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + if (!ref) + { + free(provider); + } + + return ref; +} + +static const IUnknownVtbl msdsql_vtbl = +{ + msdsql_QueryInterface, + msdsql_AddRef, + msdsql_Release +}; + +static HRESULT create_msdasql_provider(REFIID riid, void **ppv) +{ + struct msdasql *provider; + HRESULT hr; + + provider = malloc(sizeof(struct msdasql)); + if (!provider) + return E_OUTOFMEMORY; + + provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->ref = 1; + + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); + IUnknown_Release(&provider->MSDASQL_iface); + return hr; }

1 0

Alistair Leslie-Hughes : msdasql: Support IDBProperties interface.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 916690636890f8ffe474031c48d328e4f6d94a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=916690636890f8ffe474031c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:32 2021 +1100 msdasql: Support IDBProperties interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 4 +-- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 91978ad9c1a..31830e7025b 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "oledb.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -102,6 +103,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) struct msdasql { IUnknown MSDASQL_iface; + IDBProperties IDBProperties_iface; LONG ref; }; @@ -111,6 +113,11 @@ static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); } +static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -122,6 +129,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->MSDASQL_iface; } + else if(IsEqualGUID(riid, &IID_IDBProperties)) + { + *out = &provider->IDBProperties_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -165,6 +176,69 @@ static const IUnknownVtbl msdsql_vtbl = msdsql_Release }; +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -175,6 +249,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) return E_OUTOFMEMORY; provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 1897d57623f..3baa91b87a4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -994,7 +994,7 @@ static void test_odbc_provider(void) }; hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); - todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); if (FAILED(hr)) { return; @@ -1006,7 +1006,7 @@ static void test_odbc_provider(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i;

1 0

Alistair Leslie-Hughes : msdasql: Add IDBInitialize support.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 6e351769f8acd74aa5c4d55636d908be4b463f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e351769f8acd74aa5c4d556… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:33 2021 +1100 msdasql: Add IDBInitialize support. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 31830e7025b..00dbcec6780 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -104,6 +104,7 @@ struct msdasql { IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; + IDBInitialize IDBInitialize_iface; LONG ref; }; @@ -118,6 +119,11 @@ static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); } +static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -133,6 +139,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBProperties_iface; } + else if ( IsEqualGUID(riid, &IID_IDBInitialize)) + { + *out = &provider->IDBInitialize_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -239,6 +249,55 @@ static const struct IDBPropertiesVtbl dbprops_vtbl = dbprops_SetProperties }; +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + + +static const struct IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -250,6 +309,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; + provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv);

1 0

Alistair Leslie-Hughes : msdasql/tests: Initial tests.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 35532015cba9c2bb08d1b50df2dc45b0d6a18d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=35532015cba9c2bb08d1b50d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:34 2021 +1100 msdasql/tests: Initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msdasql/tests/Makefile.in | 5 + dlls/msdasql/tests/provider.c | 262 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+) diff --git a/configure b/configure index 229aaa288ac..fcf8fbdcc62 100755 --- a/configure +++ b/configure @@ -19411,6 +19411,7 @@ wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql +wine_fn_config_makefile dlls/msdasql/tests enable_tests wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 70e90c54558..b8356679e63 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,6 +3120,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) +WINE_CONFIG_MAKEFILE(dlls/msdasql/tests) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/tests/Makefile.in b/dlls/msdasql/tests/Makefile.in new file mode 100644 index 00000000000..314238660e2 --- /dev/null +++ b/dlls/msdasql/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msdasql.dll +IMPORTS = uuid oleaut32 ole32 odbccp32 + +C_SRCS = \ + provider.c diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c new file mode 100644 index 00000000000..951ab2a7387 --- /dev/null +++ b/dlls/msdasql/tests/provider.c @@ -0,0 +1,262 @@ +/* + * 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 <stdio.h> +#define COBJMACROS + +#include "msdasc.h" +#include "oledb.h" +#include "odbcinst.h" + +#include "initguid.h" + +#include "msdasql.h" + +#include "wine/test.h" + +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +static BOOL db_created; +static char mdbpath[MAX_PATH]; + +static void test_Properties(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + } + + IDBProperties_Release(props); +} + +static void test_command_interfaces(IUnknown *cmd) +{ + HRESULT hr; + ICommandProperties *commandProp; + ICommandText *comand_text; + IConvertType *convertype; + ICommandPrepare *commandprepare; + ICommandStream *commandstream; + IColumnsInfo *colinfo; + IMultipleResults *multiple; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandProperties_Release(commandProp); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandText_Release(comand_text); + + hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IConvertType_Release(convertype); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + 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); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); +} + +static void test_sessions(void) +{ + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *dbsession = NULL; + IUnknown *session = NULL; + IOpenRowset *openrowset = NULL; + IDBCreateCommand *create_command = NULL; + IUnknown *cmd = NULL; + HRESULT hr; + BSTR connect_str; + + if (!db_created) + { + skip("ODBC source wine_test not available.\n"); + return; + } + + connect_str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + + hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit ); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit ); + SysFreeString(connect_str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props ); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBProperties_Release(props); + + hr = IDBInitialize_Initialize( dbinit ); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&dbsession ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + test_command_interfaces(cmd); + IUnknown_Release(cmd); + } + + IDBCreateCommand_Release(create_command); + IOpenRowset_Release(openrowset); + IUnknown_Release( session ); + IDBCreateSession_Release(dbsession); + IDBInitialize_Uninitialize( dbinit ); + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); +} + +static void setup_database(void) +{ + char *driver; + DWORD code; + char buffer[1024]; + WORD size; + + if (winetest_interactive) + { + trace("assuming odbc 'wine_test' is available\n"); + db_created = TRUE; + return; + } + + /* + * 32 bit Windows has a default driver for "Microsoft Access Driver" (Windows 7+) + * and has the ability to create files on the fly. + * + * 64 bit Windows ONLY has a driver for "SQL Server", which we cannot use since we don't have a + * server to connect to. + * + * The filename passed to CREATE_DB must end in mdb. + */ + GetTempPathA(sizeof(mdbpath), mdbpath); + strcat(mdbpath, "wine_test.mdb"); + + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof("DSN=wine_test\0CREATE_DB=") + strlen(mdbpath) + 2); + memcpy(driver, "DSN=wine_test\0CREATE_DB=", sizeof("DSN=wine_test\0CREATE_DB=")); + strcat(driver+sizeof("DSN=wine_test\0CREATE_DB=")-1, mdbpath); + + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + if (!db_created) + { + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + + HeapFree(GetProcessHeap(), 0, driver); + + return; + } + + memcpy(driver, "DSN=wine_test\0DBQ=", sizeof("DSN=wine_test\0DBQ=")); + strcat(driver+sizeof("DSN=wine_test\0DBQ=")-1, mdbpath); + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + + HeapFree(GetProcessHeap(), 0, driver); +} + +static void cleanup_database(void) +{ + if (winetest_interactive) + return; + + DeleteFileA(mdbpath); +} + +START_TEST(provider) +{ + CoInitialize(0); + + setup_database(); + + test_Properties(); + test_sessions(); + + cleanup_database(); + + CoUninitialize(); +}

1 0

Dmitry Timoshkov : user32: DragDetect() should enter its message loop only if the left mouse button is pressed.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: ababea0fd7036ab13ec17d31afbd584c39f62696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ababea0fd7036ab13ec17d31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 25 12:41:59 2021 +0300 user32: DragDetect() should enter its message loop only if the left mouse button is pressed. There's an application that calls DragDetect() on every WM_MOUSEMOVE message, and this breaks handling of mouse events. A simple test app shows that on Windows DragDetect() starts its message loop when left mouse button is pressed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 17 +++++++++++++++++ dlls/user32/win.c | 10 ++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b13d93be14..88989f4064b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12293,6 +12293,22 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +static void test_DragDetect(void) +{ + POINT pt; + BOOL ret; + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); + + GetCursorPos(&pt); + ret = DragDetect(hwndMain, pt); + ok(!ret, "got %d\n", ret); + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); +} + START_TEST(win) { char **argv; @@ -12461,6 +12477,7 @@ START_TEST(win) test_other_process_window(argv[0]); test_SC_SIZE(); test_cancel_mode(); + test_DragDetect(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d0240f21a8..3c6810f4200 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3893,9 +3893,15 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) { MSG msg; RECT rect; - WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); - WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + WORD wDragWidth, wDragHeight; + TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); + + if (!(GetKeyState( VK_LBUTTON ) & 0x8000)) + return FALSE; + + wDragWidth = GetSystemMetrics(SM_CXDRAG); + wDragHeight= GetSystemMetrics(SM_CYDRAG); SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); SetCapture(hWnd);

1 0

Alistair Leslie-Hughes : cng.sys: New dll.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: d09d4d97e02a724c98df9a6cacc8d8f4e545ee0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d09d4d97e02a724c98df9a6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 22 21:40:08 2021 +1100 cng.sys: New dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48981 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/cng.sys/Makefile.in | 1 + dlls/cng.sys/cng.sys.spec | 63 +++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 68 insertions(+) diff --git a/configure b/configure index 389b83e931e..5100dd8af5f 100755 --- a/configure +++ b/configure @@ -1174,6 +1174,7 @@ enable_cards enable_cdosys enable_cfgmgr32 enable_clusapi +enable_cng_sys enable_combase enable_comcat enable_comctl32 @@ -19002,6 +19003,7 @@ wine_fn_config_makefile dlls/cards enable_cards wine_fn_config_makefile dlls/cdosys enable_cdosys wine_fn_config_makefile dlls/cfgmgr32 enable_cfgmgr32 wine_fn_config_makefile dlls/clusapi enable_clusapi +wine_fn_config_makefile dlls/cng.sys enable_cng_sys wine_fn_config_makefile dlls/combase enable_combase wine_fn_config_makefile dlls/combase/tests enable_tests wine_fn_config_makefile dlls/comcat enable_comcat diff --git a/configure.ac b/configure.ac index 0dbf7365714..6941b2c73a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,6 +2713,7 @@ WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) WINE_CONFIG_MAKEFILE(dlls/clusapi) +WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) WINE_CONFIG_MAKEFILE(dlls/combase/tests) WINE_CONFIG_MAKEFILE(dlls/comcat) diff --git a/dlls/cng.sys/Makefile.in b/dlls/cng.sys/Makefile.in new file mode 100644 index 00000000000..81d37898e01 --- /dev/null +++ b/dlls/cng.sys/Makefile.in @@ -0,0 +1 @@ +MODULE = cng.sys diff --git a/dlls/cng.sys/cng.sys.spec b/dlls/cng.sys/cng.sys.spec new file mode 100644 index 00000000000..0a2858579d2 --- /dev/null +++ b/dlls/cng.sys/cng.sys.spec @@ -0,0 +1,63 @@ +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptCreateMultiHash +@ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey +@ stdcall BCryptDeriveKeyCapi(ptr ptr ptr long long) bcrypt.BCryptDeriveKeyCapi +@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey +@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret +@ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash +@ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey +@ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey +@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair +@ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) bcrypt.BCryptImportKey +@ stdcall BCryptImportKeyPair(ptr ptr wstr ptr ptr long long) bcrypt.BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptProcessMultiOperations +@ stub BCryptRegisterConfigChangeNotify +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stub BCryptResolveProviders +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement +@ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty +@ stdcall BCryptSignHash(ptr ptr ptr long ptr long ptr long) bcrypt.BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider +@ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) bcrypt.BCryptVerifySignature +@ stub CngGetFipsAlgorithmMode +@ stub EntropyPoolTriggerReseedForIum +@ stub EntropyProvideData +@ stub EntropyRegisterCallback +@ stub EntropyRegisterSource +@ stub EntropyUnregisterSource +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeObject +@ stub SslImportKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SymCrypt802_11SaeCustomCommitCreate +@ stub SymCrypt802_11SaeCustomCommitProcess +@ stub SymCrypt802_11SaeCustomDestroy +@ stub SymCrypt802_11SaeCustomInit +@ stub SystemPrng diff --git a/tools/make_specfiles b/tools/make_specfiles index ecfc6d0e8f2..f9e93799ba2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -507,6 +507,7 @@ my @dll_groups = [ "bcrypt", "ncrypt", + "cng.sys", ], [ "ntoskrnl.exe",

1 0

Alex Henrie : dxtrans: Add DllGetClassObject stub.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: a0f86f4410e7524a98779389d73fbc1472226bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f86f4410e7524a98779389… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 24 19:20:47 2021 -0600 dxtrans: Add DllGetClassObject stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51917 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 2 +- dlls/dxtrans/main.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in index b5c1602917f..cf669277b93 100644 --- a/dlls/dxtrans/Makefile.in +++ b/dlls/dxtrans/Makefile.in @@ -1 +1,4 @@ MODULE = dxtrans.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index 7c2d605e534..b8ff0297a1b 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -6,6 +6,6 @@ @ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dxtrans/main.c b/dlls/dxtrans/main.c new file mode 100644 index 00000000000..2b87e9f69c4 --- /dev/null +++ b/dlls/dxtrans/main.c @@ -0,0 +1,35 @@ +/* + * DirectX Transitions + * + * Copyright 2021 Alex Henrie + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxtrans); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

Biswapriyo Nath : include: Add MFVideoAlphaBitmapFlags in evr9.idl.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: f388270b67d15c728754cdf9008f5c9cb8bbb36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f388270b67d15c728754cdf9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Oct 21 10:30:58 2021 +0530 include: Add MFVideoAlphaBitmapFlags in evr9.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/evr9.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/evr9.idl b/include/evr9.idl index b3d363cdee9..0e846db5e53 100644 --- a/include/evr9.idl +++ b/include/evr9.idl @@ -41,6 +41,17 @@ typedef struct MFVideoAlphaBitmap MFVideoAlphaBitmapParams params; } MFVideoAlphaBitmap; +typedef enum +{ + MFVideoAlphaBitmap_EntireDDS = 0x1, + MFVideoAlphaBitmap_SrcColorKey = 0x2, + MFVideoAlphaBitmap_SrcRect = 0x4, + MFVideoAlphaBitmap_DestRect = 0x8, + MFVideoAlphaBitmap_FilterMode = 0x10, + MFVideoAlphaBitmap_Alpha = 0x20, + MFVideoAlphaBitmap_BitMask = 0x3f +} MFVideoAlphaBitmapFlags; + [ object, uuid(814c7b20-0fdb-4eec-af8f-f957c8f69edc),

1 0

Rémi Bernon : winex11.drv: Introduce new map_raw_event_coords helper.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 7bc5b6800e0a78ab744532b7ed28ee04d38110f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc5b6800e0a78ab744532b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:52 2021 +0200 winex11.drv: Introduce new map_raw_event_coords helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 125 ++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 42bac332664..2243261e0b8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -634,6 +634,65 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + const double *values = event->valuators.values; + struct x11drv_valuator_data *x_rel, *y_rel; + double dx = 0, dy = 0, val; + RECT virtual_rect; + int i; + + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + x_rel = &thread_data->x_rel_valuator; + y_rel = &thread_data->y_rel_valuator; + + virtual_rect = get_virtual_screen_rect(); + + for (i = 0; i <= max( x_rel->number, y_rel->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + val = *values++; + if (i == x_rel->number) + { + input->u.mi.dx = dx = val; + if (x_rel->min < x_rel->max) + input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + } + if (i == y_rel->number) + { + input->u.mi.dy = dy = val; + if (y_rel->min < y_rel->max) + input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + } + } + + TRACE( "pos %d,%d (event %f,%f)\n", input->u.mi.dx, input->u.mi.dy, dx, dy ); + return TRUE; +} + /*********************************************************************** * send_mouse_input @@ -1827,79 +1886,23 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; - const double *values = event->valuators.values; - RECT virtual_rect; INPUT input; - int i; - double dx = 0, dy = 0, val; - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; - - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } + TRACE( "old serial %lu, ignoring\n", xev->serial ); + return FALSE; } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - + input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; input.u.mi.dx = 0; input.u.mi.dy = 0; + if (!map_raw_event_coords( event, &input )) return FALSE; - virtual_rect = get_virtual_screen_rect(); - - for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - val = *values++; - if (i == x_rel->number) - { - input.u.mi.dx = dx = val; - if (x_rel->min < x_rel->max) - input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) - / (x_rel->max - x_rel->min); - } - if (i == y_rel->number) - { - input.u.mi.dy = dy = val; - if (y_rel->min < y_rel->max) - input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) - / (y_rel->max - y_rel->min); - } - } - - if (broken_rawevents && is_old_motion_event( xev->serial )) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return FALSE; - } - - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - - input.type = INPUT_MOUSE; __wine_send_input( 0, &input, NULL ); return TRUE; }

1 0

Rémi Bernon : winex11.drv: Use XIValuatorClassInfo instead of a custom struct.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: da11387857f69d8bf68de56197390052f680f283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da11387857f69d8bf68de561… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:53 2021 +0200 winex11.drv: Use XIValuatorClassInfo instead of a custom struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 18 +++--------------- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 16 +++++++--------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2243261e0b8..c6daa30392c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -262,25 +262,13 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator for (i = 0; i < n_valuators; i++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i]; - struct x11drv_valuator_data *valuator_data = NULL; - if (valuators[i]->type != XIValuatorClass) continue; if (class->label == x11drv_atom( Rel_X ) || (!class->label && class->number == 0 && class->mode == XIModeRelative)) - { - valuator_data = &thread_data->x_rel_valuator; - } + thread_data->x_rel_valuator = *class; else if (class->label == x11drv_atom( Rel_Y ) || (!class->label && class->number == 1 && class->mode == XIModeRelative)) - { - valuator_data = &thread_data->y_rel_valuator; - } - - if (valuator_data) { - valuator_data->number = class->number; - valuator_data->min = class->min; - valuator_data->max = class->max; - } + thread_data->y_rel_valuator = *class; } } #endif @@ -638,7 +626,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); const double *values = event->valuators.values; - struct x11drv_valuator_data *x_rel, *y_rel; + XIValuatorClassInfo *x_rel, *y_rel; double dx = 0, dy = 0, val; RECT virtual_rect; int i; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ec2639e309..bcb0b8044bc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -36,6 +36,9 @@ #ifdef HAVE_LIBXSHAPE #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif /* avoid conflict with field names in included win32 headers */ #undef Status diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..962fe373833 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -32,6 +32,9 @@ #include <X11/Xresource.h> #include <X11/Xutil.h> #include <X11/Xatom.h> +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif #define BOOL X_BOOL #define BYTE X_BYTE @@ -314,13 +317,6 @@ struct x11drv_escape_flush_gl_drawable * X11 USER driver */ -struct x11drv_valuator_data -{ - double min; - double max; - int number; -}; - struct x11drv_thread_data { Display *display; @@ -335,13 +331,15 @@ struct x11drv_thread_data Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; - struct x11drv_valuator_data x_rel_valuator; - struct x11drv_valuator_data y_rel_valuator; + XIValuatorClassInfo x_rel_valuator; + XIValuatorClassInfo y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;

1 0