January 2020 - wine-devel

[PATCH v2 2/2] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..e74fcd6c02 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -125,14 +127,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..e77eaa3633 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -661,6 +661,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -696,6 +697,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1

1 0

[PATCH v2 1/2] include: Register all ADODB interfaces
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

--- include/msado15_backcompat.idl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..a813b80bf7 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -50,6 +50,14 @@ interface Recordset21; dispinterface ConnectionEvents; dispinterface RecordsetEvents; +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum { adErrInvalidArgument = 3001, @@ -2044,14 +2052,6 @@ interface ADORecordsetConstruction : IDispatch [in] IUnknown *row_pos); }; -[ - uuid(2a75196c-d9eb-4129-b803-931327f72d5c), - version(2.8) -] -library ADODB -{ - importlib("stdole2.tlb"); - [ uuid(00000514-0000-0010-8000-00aa006d2ea4), ] -- 2.24.1

1 0

[PATCH v2 1/2] include: Add XACTENGINE_* error codes
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index 7743d131f6..a77afff6d4 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -572,3 +572,49 @@ interface IXACT3Wave HRESULT GetProperties([out] XACT_WAVE_INSTANCE_PROPERTIES *pProperties); } + +cpp_quote("#define FACILITY_XACTENGINE 0xAC7") +cpp_quote("#define XACTENGINEERROR(n) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_XACTENGINE, n)") + +cpp_quote("#define XACTENGINE_E_OUTOFMEMORY E_OUTOFMEMORY") +cpp_quote("#define XACTENGINE_E_INVALIDARG E_INVALIDARG") +cpp_quote("#define XACTENGINE_E_NOTIMPL E_NOTIMPL") +cpp_quote("#define XACTENGINE_E_FAIL E_FAIL") + +cpp_quote("#define XACTENGINE_E_ALREADYINITIALIZED XACTENGINEERROR(0x001)") +cpp_quote("#define XACTENGINE_E_NOTINITIALIZED XACTENGINEERROR(0x002)") +cpp_quote("#define XACTENGINE_E_EXPIRED XACTENGINEERROR(0x003)") +cpp_quote("#define XACTENGINE_E_NONOTIFICATIONCALLBACK XACTENGINEERROR(0x004)") +cpp_quote("#define XACTENGINE_E_NOTIFICATIONREGISTERED XACTENGINEERROR(0x005)") +cpp_quote("#define XACTENGINE_E_INVALIDUSAGE XACTENGINEERROR(0x006)") +cpp_quote("#define XACTENGINE_E_INVALIDDATA XACTENGINEERROR(0x007)") +cpp_quote("#define XACTENGINE_E_INSTANCELIMITFAILTOPLAY XACTENGINEERROR(0x008)") +cpp_quote("#define XACTENGINE_E_NOGLOBALSETTINGS XACTENGINEERROR(0x009)") +cpp_quote("#define XACTENGINE_E_INVALIDVARIABLEINDEX XACTENGINEERROR(0x00a)") +cpp_quote("#define XACTENGINE_E_INVALIDCATEGORY XACTENGINEERROR(0x00b)") +cpp_quote("#define XACTENGINE_E_INVALIDCUEINDEX XACTENGINEERROR(0x00c)") +cpp_quote("#define XACTENGINE_E_INVALIDWAVEINDEX XACTENGINEERROR(0x00d)") +cpp_quote("#define XACTENGINE_E_INVALIDTRACKINDEX XACTENGINEERROR(0x00e)") +cpp_quote("#define XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX XACTENGINEERROR(0x00f)") +cpp_quote("#define XACTENGINE_E_READFILE XACTENGINEERROR(0x010)") +cpp_quote("#define XACTENGINE_E_UNKNOWNEVENT XACTENGINEERROR(0x011)") +cpp_quote("#define XACTENGINE_E_INCALLBACK XACTENGINEERROR(0x012)") +cpp_quote("#define XACTENGINE_E_NOWAVEBANK XACTENGINEERROR(0x013)") +cpp_quote("#define XACTENGINE_E_SELECTVARIATION XACTENGINEERROR(0x014)") +cpp_quote("#define XACTENGINE_E_MULTIPLEAUDITIONENGINES XACTENGINEERROR(0x015)") +cpp_quote("#define XACTENGINE_E_WAVEBANKNOTPREPARED XACTENGINEERROR(0x016)") +cpp_quote("#define XACTENGINE_E_NORENDERER XACTENGINEERROR(0x017)") +cpp_quote("#define XACTENGINE_E_INVALIDENTRYCOUNT XACTENGINEERROR(0x018)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDCUEEND XACTENGINEERROR(0x019)") +cpp_quote("#define XACTENGINE_E_SEEKTIMEBEYONDWAVEEND XACTENGINEERROR(0x01a)") +cpp_quote("#define XACTENGINE_E_NOFRIENDLYNAMES XACTENGINEERROR(0x01b)") + +cpp_quote("#define XACTENGINE_E_AUDITION_WRITEFILE XACTENGINEERROR(0x101)") +cpp_quote("#define XACTENGINE_E_AUDITION_NOSOUNDBANK XACTENGINEERROR(0x102)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDRPCINDEX XACTENGINEERROR(0x103)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGDATA XACTENGINEERROR(0x104)") +cpp_quote("#define XACTENGINE_E_AUDITION_UNKNOWNCOMMAND XACTENGINEERROR(0x105)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDDSPINDEX XACTENGINEERROR(0x106)") +cpp_quote("#define XACTENGINE_E_AUDITION_MISSINGWAVE XACTENGINEERROR(0x107)") +cpp_quote("#define XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED XACTENGINEERROR(0x108)") +cpp_quote("#define XACTENGINE_E_AUDITION_INVALIDSESSION XACTENGINEERROR(0x109)") -- 2.24.1

1 1

[PATCH 3/3] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b267fc08c0..6fecb72615 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -135,14 +137,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 17be9e4f14..431566f0bf 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -663,6 +663,7 @@ static void test_Connection(void) IMarshal *marshal; IExternalConnection *external; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -704,6 +705,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1

2 1

[PATCH v2 2/2] include: Add XACT defines
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.idl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/xact3.idl b/include/xact3.idl index a77afff6d4..cfa9e00fdc 100644 --- a/include/xact3.idl +++ b/include/xact3.idl @@ -19,6 +19,9 @@ import "unknwn.idl"; import "xaudio2.idl"; +cpp_quote("#include <limits.h>") +cpp_quote("#include <float.h>") + [ uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] @@ -313,6 +316,40 @@ cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEDESTROYED cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKPREPARED = 17;") cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT = 18;") +cpp_quote("static const XACTTIME XACTTIME_MIN = INT_MIN;") +cpp_quote("static const XACTTIME XACTTIME_MAX = INT_MAX;") +cpp_quote("static const XACTTIME XACTTIME_INFINITE = INT_MAX;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_INFINITE = 0xff;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MIN = 0x00;") +cpp_quote("static const XACTINSTANCELIMIT XACTINSTANCELIMIT_MAX = 0xfe;") +cpp_quote("static const XACTINDEX XACTINDEX_MIN = 0x00;") +cpp_quote("static const XACTINDEX XACTINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTINDEX XACTINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MIN = 0x00;") +cpp_quote("static const XACTNOTIFICATIONTYPE XACTNOTIFICATIONTYPE_MAX = 0xff;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTVARIABLEVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MIN = 0x0000;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_MAX = 0xfffe;") +cpp_quote("static const XACTVARIABLEINDEX XACTVARIABLEINDEX_INVALID = 0xffff;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MIN = 0x0;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_MAX = 0xfffe;") +cpp_quote("static const XACTCATEGORY XACTCATEGORY_INVALID = 0xffff;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MIN = 0;") +cpp_quote("static const XACTCHANNEL XACTCHANNEL_MAX = 0xff;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN = -1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX = 1200;") +cpp_quote("static const XACTPITCH XACTPITCH_MIN_TOTAL = -2400;") +cpp_quote("static const XACTPITCH XACTPITCH_MAX_TOTAL = 2400;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MIN = 0.0f;") +cpp_quote("static const XACTVOLUME XACTVOLUME_MAX = 16777216.0f;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MIN = -FLT_MAX;") +cpp_quote("static const XACTVARIABLEVALUE XACTPARAMETERVALUE_MAX = FLT_MAX;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MIN = 0x00;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_MAX = 0xfe;") +cpp_quote("static const XACTLOOPCOUNT XACTLOOPCOUNT_INFINITE = 0xff;") +cpp_quote("static const DWORD XACTWAVEALIGNMENT_MIN = 2048;") + [ object, uuid(b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b), -- 2.24.1

1 0

[PATCH 1/3] msado15: Silence some queried interfaces.
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 10 ++++++++++ dlls/msado15/tests/msado15.c | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..b267fc08c0 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -81,6 +81,16 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->ISupportErrorInfo_iface; } + else if(IsEqualGUID( riid, &IID_IMarshal )) + { + TRACE("IMarshal not supported\n"); + return E_NOINTERFACE; + } + else if(IsEqualGUID( riid, &IID_IExternalConnection )) + { + TRACE("IExternalConnection not supported\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..17be9e4f14 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -660,6 +660,8 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; + IMarshal *marshal; + IExternalConnection *external; LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); @@ -672,6 +674,12 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Connection_QueryInterface(connection, &IID_IMarshal, (void**)&marshal); + ok(hr == E_NOINTERFACE, "Unexpected IMarshal interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_IExternalConnection, (void**)&external); + ok(hr == E_NOINTERFACE, "Unexpected IExternalConnection interface\n"); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL); -- 2.24.1

2 1

[PATCH 2/3] include: Register all ADODB interfaces
by Alistair Leslie-Hughes 24 Jan '20

24 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..a813b80bf7 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -50,6 +50,14 @@ interface Recordset21; dispinterface ConnectionEvents; dispinterface RecordsetEvents; +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum { adErrInvalidArgument = 3001, @@ -2044,14 +2052,6 @@ interface ADORecordsetConstruction : IDispatch [in] IUnknown *row_pos); }; -[ - uuid(2a75196c-d9eb-4129-b803-931327f72d5c), - version(2.8) -] -library ADODB -{ - importlib("stdole2.tlb"); - [ uuid(00000514-0000-0010-8000-00aa006d2ea4), ] -- 2.24.1

1 0