November 2023 - Wine-commits

Zhiyi Zhang : msdasql/tests: Add more IDBProperties::GetProperties() tests.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: fd2a2d3842ca05ef4ea0433b6f539461738fb38c URL: https://gitlab.winehq.org/wine/wine/-/commit/fd2a2d3842ca05ef4ea0433b6f5394… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 17:54:13 2023 +0800 msdasql/tests: Add more IDBProperties::GetProperties() tests. --- dlls/msdasql/tests/provider.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b6936be31b5..10517484c83 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -154,6 +154,7 @@ static void test_Properties(void) free_dbpropinfoset(infocount, propinfoset); CoTaskMemFree(desc); + /* Test specifying all supported properties */ hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); ok(propidlist.cPropertyIDs == 14, "got %lu\n", propidlist.cPropertyIDs); @@ -184,7 +185,44 @@ static void test_Properties(void) ok(V_VT(&propset->rgProperties[i].vValue) == vartype, "%lu wrong type %d\n", i, V_VT(&propset->rgProperties[i].vValue)); } + for (i = 0; i < propset->cProperties; i++) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); + + free_dbpropset(propcnt, propset); + + /* Test specifying only one supported properties */ + propidlist.cPropertyIDs = 1; + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(propset->cProperties == 1, "expected 1, got %lu\n", propset->cProperties); + free_dbpropset(propcnt, propset); + + /* Test when cPropertyIDSets is zero, all initialization properties should be returned */ + hr = IDBProperties_GetProperties(props, 0, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + todo_wine + ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); + for (i = 0; i < propset->cProperties; i++) + todo_wine_if(i > 0) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); + free_dbpropset(propcnt, propset); + + /* Test when propidlist.cPropertyIDs is zero, all initialization properties should be returned */ CoTaskMemFree(propidlist.rgPropertyIDs); + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = 0; + propidlist.rgPropertyIDs = NULL; + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + todo_wine + ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); + todo_wine + for (i = 0; i < propset->cProperties; i++) + ok(propset->rgProperties[i].dwPropertyID == properties[i], + "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); free_dbpropset(propcnt, propset); }

1 0

Zhiyi Zhang : msdasql: Return all initialization properties if no property ID is specified in dbprops_GetProperties().
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: f0bad1ec37a135d41ad2a31f8e245166447d1dd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0bad1ec37a135d41ad2a31f8e2451… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 18:04:21 2023 +0800 msdasql: Return all initialization properties if no property ID is specified in dbprops_GetProperties(). --- dlls/msdasql/msdasql_main.c | 34 +++++++++++++++++++++++++++++++--- dlls/msdasql/tests/provider.c | 4 ---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 7ec35678b6f..34342295651 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -357,18 +357,19 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert struct msdasql *provider = impl_from_IDBProperties(iface); int i, j, k; DBPROPSET *propset; + BOOL no_prop_id; TRACE("(%p)->(%ld %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); *pcPropertySets = 1; - if (cPropertyIDSets != 1) + if (cPropertyIDSets > 1) { - FIXME("Currently only 1 property set supported.\n"); + FIXME("Currently only 0 or 1 property set are supported.\n"); cPropertyIDSets = 1; } - propset = CoTaskMemAlloc(cPropertyIDSets * sizeof(DBPROPSET)); + propset = CoTaskMemAlloc(max(cPropertyIDSets, 1) * sizeof(DBPROPSET)); if (IsEqualGUID(&rgPropertyIDSets[0].guidPropertySet, &DBPROPSET_DATASOURCEINFO)) { @@ -391,6 +392,33 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert propset->guidPropertySet = DBPROPSET_DBINIT; + no_prop_id = TRUE; + for (i = 0; i < cPropertyIDSets; i++) + { + if (rgPropertyIDSets[i].cPropertyIDs) + { + no_prop_id = FALSE; + break; + } + } + + /* If no property ID is specified then return all currently set properties */ + if (no_prop_id) + { + propset->cProperties = ARRAY_SIZE(provider->properties); + propset->rgProperties = CoTaskMemAlloc(propset->cProperties * sizeof(DBPROP)); + for(i = 0; i < ARRAY_SIZE(provider->properties); i++) + { + propset->rgProperties[i].dwPropertyID = provider->properties[i].id; + V_VT(&propset->rgProperties[i].vValue) = VT_EMPTY; + VariantCopy(&propset->rgProperties[i].vValue, &provider->properties[i].value); + } + + *prgPropertySets = propset; + return S_OK; + } + + /* Return property info for properties in the specified property ID sets */ for (i=0; i < cPropertyIDSets; i++) { TRACE("Property id %d (count %ld, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 10517484c83..706d5a13ef9 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -201,10 +201,8 @@ static void test_Properties(void) /* Test when cPropertyIDSets is zero, all initialization properties should be returned */ hr = IDBProperties_GetProperties(props, 0, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); for (i = 0; i < propset->cProperties; i++) - todo_wine_if(i > 0) ok(propset->rgProperties[i].dwPropertyID == properties[i], "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID); free_dbpropset(propcnt, propset); @@ -217,9 +215,7 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(propset->cProperties == ARRAY_SIZE(properties), "got %lu\n", propset->cProperties); - todo_wine for (i = 0; i < propset->cProperties; i++) ok(propset->rgProperties[i].dwPropertyID == properties[i], "%ld %ld, got %ld\n", i, properties[i], propset->rgProperties[i].dwPropertyID);

1 0

Zhiyi Zhang : oledb32: Add missing const modifiers.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 18c057ee4c18837a447a3962e6af6e5b0d77aca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/18c057ee4c18837a447a3962e6af6e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 12:19:11 2023 +0800 oledb32: Add missing const modifiers. --- dlls/oledb32/datainit.c | 10 +++++----- dlls/oledb32/dslocator.c | 6 +++--- dlls/oledb32/oledb_private.h | 2 +- include/msdasc.idl | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3694ac67fec..c2066712f8b 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -631,7 +631,7 @@ static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) return r; } -HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) +HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPCOLESTR initstring, REFIID riid, IUnknown **datasource) { static const WCHAR providerW[] = L"Provider="; BOOL datasource_created = FALSE; @@ -768,7 +768,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID } static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, - LPWSTR initstring, REFIID riid, IUnknown **datasource) + LPCOLESTR initstring, REFIID riid, IUnknown **datasource) { datainit *This = impl_from_IDataInitialize(iface); @@ -977,7 +977,7 @@ static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLS return E_NOTIMPL; } -static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPWSTR pwszFileName, +static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPCOLESTR pwszFileName, LPWSTR *ppwszInitializationString) { datainit *This = impl_from_IDataInitialize(iface); @@ -987,8 +987,8 @@ static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPW return E_NOTIMPL; } -static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWSTR pwszFileName, - LPWSTR pwszInitializationString, DWORD dwCreationDisposition) +static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPCOLESTR pwszFileName, + LPCOLESTR pwszInitializationString, DWORD dwCreationDisposition) { datainit *This = impl_from_IDataInitialize(iface); diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 6991be65f65..066f14a5508 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -707,7 +707,7 @@ static ULONG WINAPI datainitialize_Release(IDataInitialize *iface) } static HRESULT WINAPI datainitialize_GetDataSource(IDataInitialize *iface, - IUnknown *outer, DWORD context, LPWSTR initstring, REFIID riid, IUnknown **datasource) + IUnknown *outer, DWORD context, LPCOLESTR initstring, REFIID riid, IUnknown **datasource) { TRACE("(%p)->(%p %#lx %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), datasource); @@ -738,13 +738,13 @@ static HRESULT WINAPI datainitialize_CreateDBInstanceEx(IDataInitialize *iface, return E_NOTIMPL; } -static HRESULT WINAPI datainitialize_LoadStringFromStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR *initstring) +static HRESULT WINAPI datainitialize_LoadStringFromStorage(IDataInitialize *iface, LPCOLESTR filename, LPWSTR *initstring) { FIXME("(%p)->(%s %p): stub\n", iface, debugstr_w(filename), initstring); return E_NOTIMPL; } -static HRESULT WINAPI datainitialize_WriteStringToStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR initstring, +static HRESULT WINAPI datainitialize_WriteStringToStorage(IDataInitialize *iface, LPCOLESTR filename, LPCOLESTR initstring, DWORD disposition) { FIXME("(%p)->(%s %s %#lx): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition); diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 3bc16f73f52..278b3c47f0e 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -23,7 +23,7 @@ HRESULT create_error_info(IUnknown *outer, void **obj); HRESULT create_oledb_rowpos(IUnknown *outer, void **obj); HRESULT create_dslocator(IUnknown *outer, void **obj); -HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, +HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPCOLESTR initstring, REFIID riid, IUnknown **datasource); extern HINSTANCE instance; diff --git a/include/msdasc.idl b/include/msdasc.idl index 6a904ba1d2f..98d3f2abb50 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -92,7 +92,7 @@ library MSDASC interface IDataInitialize : IUnknown { HRESULT GetDataSource([in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, - [in] LPWSTR pwszInitializationString, [in] REFIID riid, + [in] LPCOLESTR pwszInitializationString, [in] REFIID riid, [in, out] IUnknown** ppDataSource); HRESULT GetInitializationString([in] IUnknown* pDataSource, [in] boolean fIncludePassword, @@ -113,9 +113,9 @@ library MSDASC [in] DWORD cmq, [in, size_is(cmq)] const IID **iids, [out, size_is(cmq)] IUnknown **ifs, [out, size_is(cmq)] HRESULT *hr); - HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString); + HRESULT LoadStringFromStorage([in] LPCOLESTR pwszFileName, [out] LPOLESTR *ppwszInitializationString); - HRESULT WriteStringToStorage([in] LPWSTR pwszFileName, [in] LPWSTR pwszInitializationString, + HRESULT WriteStringToStorage([in] LPCOLESTR pwszFileName, [in] LPCOLESTR pwszInitializationString, [in] DWORD dwCreationDisposition); }

1 0

Zhiyi Zhang : oledb32/tests: Use wide-char string literals.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 5823d98692b013a4b34f6d077d609d46b5bd0c11 URL: https://gitlab.winehq.org/wine/wine/-/commit/5823d98692b013a4b34f6d077d609d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 12:23:29 2023 +0800 oledb32/tests: Use wide-char string literals. And make these strings const. --- dlls/oledb32/tests/database.c | 57 ++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c0a4fbd4005..4a3d7c8c907 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -38,8 +38,6 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d); -static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; - #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -49,7 +47,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %ld, got %ld\n", ref, rc); } -static void test_GetDataSource(WCHAR *initstring) +static void test_GetDataSource(const WCHAR *initstring) { IDataInitialize *datainit = NULL; IDBInitialize *dbinit = NULL; @@ -223,8 +221,7 @@ static ULONG WINAPI dbpersist_Release(IPersist *iface) static HRESULT WINAPI dbpersist_GetClassID(IPersist *iface, CLSID *clsid) { - static const WCHAR msdasqlW[] = {'M','S','D','A','S','Q','L',0}; - return CLSIDFromProgID(msdasqlW, clsid); + return CLSIDFromProgID(L"MSDASQL", clsid); } static const IPersistVtbl dbpersistvtbl = { @@ -289,7 +286,7 @@ static const IDBInitializeVtbl dbinitvtbl = { static IDBInitialize dbinittest = { &dbinitvtbl }; -static void test_GetDataSource2(WCHAR *initstring) +static void test_GetDataSource2(const WCHAR *initstring) { IDataInitialize *datainit = NULL; IDBInitialize *dbinit = NULL; @@ -307,24 +304,14 @@ static void test_GetDataSource2(WCHAR *initstring) static void test_database(void) { - static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', - 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', - 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; - static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; - static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', - 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; - static WCHAR initial_catalog_prop[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', - 'i','n','i','t','i','a','l','_','c','a','t','a','l','o','g','_','t','e','s','t',';', - 'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g','=','d','u','m','m','y','_','c','a','t','a','l','o','g',0}; - static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', - 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', - ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; - static WCHAR extended_prop2[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','\'','d','u','m','m','y','\'',';', - 'c','u','s','t','o','m','p','r','o','p','=','\'','1','2','3','.','4','\'',';',0}; - static WCHAR multi_provider_prop_test[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', - 'p','r','o','v','i','d','e','r','_','p','r','o','p','_','t','e','s','t',';', - 'a','=','1',';','b','=','2',';','c','=','3',';',0}; + static const WCHAR *initstring_default = L"Data Source=dummy;"; + static const WCHAR *initstring_jet = L"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=dummy;Persist Security Info=False;"; + static const WCHAR *initstring_lower = L"data source=dummy;"; + static const WCHAR *customprop = L"data source=dummy;customprop=123.4;"; + static const WCHAR *initial_catalog_prop = L"Data Source=initial_catalog_test;Initial Catalog=dummy_catalog"; + static const WCHAR *extended_prop = L"data source=dummy;Extended Properties=\"DRIVER=A Wine ODBC driver;UID=wine;\";"; + static const WCHAR *extended_prop2 = L"data source=\'dummy\';customprop=\'123.4\';"; + static const WCHAR *multi_provider_prop_test = L"Data Source=provider_prop_test;a=1;b=2;c=3;"; IDataInitialize *datainit = NULL; HRESULT hr; @@ -532,21 +519,13 @@ static void test_errorinfo(void) static void test_initializationstring(void) { - static const WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; - static const WCHAR initstring_msdasql2[] = {'p','R','o','V','i','D','e','R','=','M','S','D','A','S','Q','L','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; - static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; - static const WCHAR initstring_mode[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', - 'M','o','d','e','=','i','n','v','a','l','i','d',0}; - static const WCHAR initstring_mode2[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', - 'M','o','d','e','=','W','r','i','t','e','R','e','a','d',0}; - static const WCHAR initstring_mode3[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', - 'M','o','d','e','=','R','e','a','d','W','R','I','T','E',0}; + static const WCHAR *initstring_default = L"Data Source=dummy;"; + static const WCHAR *initstring_msdasql = L"Provider=MSDASQL.1;Data Source=dummy"; + static const WCHAR *initstring_msdasql2 = L"pRoViDeR=MSDASQL.1;Data Source=dummy"; + static const WCHAR *initstring_sqloledb = L"Provider=SQLOLEDB.1;Data Source=dummy"; + static const WCHAR *initstring_mode = L"Provider=MSDASQL.1;Data Source=dummy;Mode=invalid"; + static const WCHAR *initstring_mode2 = L"Provider=MSDASQL.1;Data Source=dummy;Mode=WriteRead"; + static const WCHAR *initstring_mode3 = L"Provider=MSDASQL.1;Data Source=dummy;Mode=ReadWRITE"; IDataInitialize *datainit = NULL; IDBInitialize *dbinit; HRESULT hr;

1 0

Zhiyi Zhang : oledb32/tests: Remove test_odbc_provider().
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 31707758037b04a07ed3be77bce3ebb1fd6f2027 URL: https://gitlab.winehq.org/wine/wine/-/commit/31707758037b04a07ed3be77bce3eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 17:56:57 2023 +0800 oledb32/tests: Remove test_odbc_provider(). All these tests are already covered by test_Properties() in msdasql/tests/provider.c. --- dlls/oledb32/tests/database.c | 78 ------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 4a3d7c8c907..67b45737ba8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -984,83 +984,6 @@ static void test_dslocator(void) } } -static void test_odbc_provider(void) -{ - HRESULT hr; - IDBProperties *props; - DBPROPIDSET propidset; - ULONG infocount; - DBPROPINFOSET *propinfoset; - WCHAR *desc; - DBPROPID properties[14] = - { - DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, - DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, - DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, - DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, - DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT - }; - - hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); - ok(hr == S_OK, "Failed to create object 0x%08lx\n", hr); - if (FAILED(hr)) - { - return; - } - - propidset.rgPropertyIDs = NULL; - propidset.cPropertyIDs = 0; - propidset.guidPropertySet = DBPROPSET_DBINITALL; - - infocount = 0; - hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - ok(hr == S_OK, "got 0x%08lx\n", hr); - if (hr == S_OK) - { - ULONG i; - DBPROPIDSET propidlist; - ULONG propcnt; - DBPROPSET *propset; - - ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", - debugstr_guid(&propinfoset->guidPropertySet)); - ok(propinfoset->cPropertyInfos == 14, "got %ld\n", propinfoset->cPropertyInfos); - - propidlist.guidPropertySet = DBPROPSET_DBINIT; - propidlist.cPropertyIDs = propinfoset->cPropertyInfos; - propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); - - for (i = 0; i < propinfoset->cPropertyInfos; i++) - { - ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%ld, got %ld\n", i, - propinfoset->rgPropertyInfos[i].dwPropertyID); - ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%ld, got %d\n", i, - propinfoset->rgPropertyInfos[i].vtType); - - propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; - } - - for (i = 0; i < propinfoset->cPropertyInfos; i++) - VariantClear(&propinfoset->rgPropertyInfos[i].vValues); - - CoTaskMemFree(propinfoset->rgPropertyInfos); - CoTaskMemFree(propinfoset); - - hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - ok(hr == S_OK, "got 0x%08lx\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %ld\n", propinfoset->cPropertyInfos); - - for (i = 0; i < propidlist.cPropertyIDs; i++) - ok(properties[i] == propidlist.rgPropertyIDs[i], "%ld, got %ld\n", i, - propidlist.rgPropertyIDs[i]); - - CoTaskMemFree(propidlist.rgPropertyIDs); - CoTaskMemFree(propset); - } - - IDBProperties_Release(props); -} - static void test_odbc_enumerator(void) { HRESULT hr; @@ -1105,7 +1028,6 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); test_dslocator(); - test_odbc_provider(); test_odbc_enumerator(); /* row position */

1 0

Zhiyi Zhang : oledb32/tests: Fix memory leaks.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 6b966a888a851459e1a0c241629cf88b64b200f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b966a888a851459e1a0c241629cf8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 21 10:55:59 2023 +0800 oledb32/tests: Fix memory leaks. --- dlls/oledb32/tests/database.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 67b45737ba8..ebd3cb2fadf 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -47,6 +47,19 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %ld, got %ld\n", ref, rc); } +static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) +{ + ULONG i, j; + + for (i = 0; i < count; i++) + { + for (j = 0; j < propinfoset[i].cPropertyInfos; j++) + VariantClear(&propinfoset[i].rgPropertyInfos[j].vValues); + CoTaskMemFree(propinfoset[i].rgPropertyInfos); + } + CoTaskMemFree(propinfoset); +} + static void test_GetDataSource(const WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -90,7 +103,7 @@ static void test_GetDataSource(const WCHAR *initstring) pInfoset->rgPropertyInfos[i].vtType); } - CoTaskMemFree(pInfoset); + free_dbpropinfoset(cnt, pInfoset); CoTaskMemFree(ary); }

1 0

Alistair Leslie-Hughes : msdasql: Check rowset pointer before assignment in ICommandText::Execute.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 311cf13a1c72a4419f6a0214bf7fd8baf1179bc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/311cf13a1c72a4419f6a0214bf7fd8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 22 16:27:09 2023 +1100 msdasql: Check rowset pointer before assignment in ICommandText::Execute. --- dlls/msdasql/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 7cec1523f4d..b42af7f6a02 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1263,7 +1263,8 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI return E_FAIL; } - *rowset = NULL; + if (rowset) + *rowset = NULL; if (!wcsnicmp( command->query, L"select ", 7 )) { msrowset = malloc(sizeof(*msrowset));

1 0

Zebediah Figura : ws2_32/tests: Test sending data to a peer which is closed.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 25bcb9d3630223def9668cccf48b68231a4d04d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/25bcb9d3630223def9668cccf48b68… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 2 00:55:06 2022 -0500 ws2_32/tests: Test sending data to a peer which is closed. --- dlls/ws2_32/tests/sock.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f9cc1482c41..951c4abee2e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9416,6 +9416,26 @@ static void test_shutdown(void) closesocket(client); closesocket(server); + /* Send data to a peer which is closed. */ + + tcp_socketpair(&client, &server); + + WSASetLastError(0xdeadbeef); + ret = shutdown(client, SD_SEND); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + closesocket(client); + + ret = send(server, "test", 5, 0); + ok(ret == 5, "got %d\n", ret); + + WSASetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(WSAGetLastError() == WSAECONNABORTED, "got error %u\n", WSAGetLastError()); + + closesocket(server); + /* Test shutting down with async I/O pending. */ client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);

1 0

Zebediah Figura : http.sys: Keep connection sockets open after sending a 400 response.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 2bad8d9f63db0d1005b365a6c43247ba7a925218 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bad8d9f63db0d1005b365a6c43247… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 2 00:57:05 2022 -0500 http.sys: Keep connection sockets open after sending a 400 response. Tests show that the socket is shut down, but sending further data doesn't result in a TCP reset, so we need to keep the socket itself open until the TCP connection is closed. --- dlls/http.sys/http.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 52887259aa7..093a00f1b12 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -19,6 +19,7 @@ */ #include <assert.h> +#include <stdbool.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "wine/http.h" @@ -54,6 +55,7 @@ struct connection char *buffer; unsigned int len, size; + bool shutdown; /* If there is a request fully received and waiting to be read, the * "available" parameter will be TRUE. Either there is no queue matching @@ -111,7 +113,7 @@ static struct list request_queues = LIST_INIT(request_queues); static void accept_connection(SOCKET socket) { struct connection *conn; - ULONG true = 1; + ULONG one = 1; SOCKET peer; if ((peer = accept(socket, NULL, NULL)) == INVALID_SOCKET) @@ -134,15 +136,22 @@ static void accept_connection(SOCKET socket) } conn->size = 8192; WSAEventSelect(peer, request_event, FD_READ | FD_CLOSE); - ioctlsocket(peer, FIONBIO, &true); + ioctlsocket(peer, FIONBIO, &one); conn->socket = peer; list_add_head(&connections, &conn->entry); } -static void close_connection(struct connection *conn) +static void shutdown_connection(struct connection *conn) { free(conn->buffer); shutdown(conn->socket, SD_BOTH); + conn->shutdown = true; +} + +static void close_connection(struct connection *conn) +{ + if (!conn->shutdown) + shutdown_connection(conn); closesocket(conn->socket); list_remove(&conn->entry); free(conn); @@ -593,12 +602,24 @@ static void send_400(struct connection *conn) strcat(buffer, response_body); if (send(conn->socket, buffer, strlen(buffer), 0) < 0) ERR("Failed to send 400 response, error %u.\n", WSAGetLastError()); + shutdown_connection(conn); } static void receive_data(struct connection *conn) { int len, ret; + if (conn->shutdown) + { + WSANETWORKEVENTS events; + + if ((ret = WSAEnumNetworkEvents(conn->socket, NULL, &events)) < 0) + ERR("Failed to enumerate network events, error %u.\n", WSAGetLastError()); + if (events.lNetworkEvents & FD_CLOSE) + close_connection(conn); + return; + } + /* We might be waiting for an IRP, but always call recv() anyway, since we * might have been woken up by the socket closing. */ if ((len = recv(conn->socket, conn->buffer + conn->len, conn->size - conn->len, 0)) <= 0) @@ -653,7 +674,6 @@ static void receive_data(struct connection *conn) { WARN("Failed to parse request; shutting down connection.\n"); send_400(conn); - close_connection(conn); } } @@ -714,7 +734,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) struct listening_socket *listening_sock; char *url, *endptr; size_t queue_url_len, new_url_len; - ULONG true = 1, value; + ULONG one = 1, value; SOCKET s = INVALID_SOCKET; TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); @@ -823,7 +843,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) listening_sock->socket = s; list_add_head(&listening_sockets, &listening_sock->entry); - ioctlsocket(s, FIONBIO, &true); + ioctlsocket(s, FIONBIO, &one); WSAEventSelect(s, request_event, FD_ACCEPT); } @@ -1002,7 +1022,6 @@ static NTSTATUS http_send_response(struct request_queue *queue, IRP *irp) { WARN("Failed to parse request; shutting down connection.\n"); send_400(conn); - close_connection(conn); } } else

1 0

Zebediah Figura : ws2_32/tests: Test send() after TCP reset.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: a83c3736a96226aadbed0132fbd049111aa98875 URL: https://gitlab.winehq.org/wine/wine/-/commit/a83c3736a96226aadbed0132fbd049… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 15 18:45:59 2022 -0500 ws2_32/tests: Test send() after TCP reset. --- dlls/ws2_32/tests/sock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 951c4abee2e..9f1da1039c4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13660,6 +13660,11 @@ static void test_tcp_reset(void) todo_wine ok(ret == -1, "got %d\n", ret); todo_wine ok(WSAGetLastError() == WSAECONNRESET, "got error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = send(client, "data", 5, 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAECONNRESET, "got error %u\n", WSAGetLastError()); + check_poll(client, POLLERR | POLLHUP | POLLWRNORM); FD_ZERO(&readfds);

1 0