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

[PATCH 1/2] mf/session: Implement IsRateSupported().
by Nikolay Sivov 08 Nov '21

08 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 80 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e3d77864494..c4dc6419b87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3537,6 +3537,80 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA return hr; } +static HRESULT session_is_presentation_rate_supported(struct media_session *session, BOOL thin, float rate, + float *nearest_rate) +{ + IMFRateSupport *rate_support; + struct media_source *source; + struct media_sink *sink; + float value = 0.0f, tmp; + unsigned int flags; + HRESULT hr = S_OK; + + if (!nearest_rate) nearest_rate = &tmp; + + if (rate == 0.0f) + { + *nearest_rate = 1.0f; + return S_OK; + } + + EnterCriticalSection(&session->cs); + + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + { + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = MFGetService((IUnknown *)source->source, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + { + value = 1.0f; + break; + } + + value = rate; + if (FAILED(hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, &value))) + WARN("Source does not support rate %f, hr %#x.\n", rate, hr); + IMFRateSupport_Release(rate_support); + + /* Only "first" source is considered. */ + break; + } + + if (SUCCEEDED(hr)) + { + /* For sinks only check if rate is supported, ignoring nearest values. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + flags = 0; + if (FAILED(hr = IMFMediaSink_GetCharacteristics(sink->sink, &flags))) + break; + + if (flags & MEDIASINK_RATELESS) + continue; + + if (FAILED(MFGetService((IUnknown *)sink->sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, + (void **)&rate_support))) + continue; + + hr = IMFRateSupport_IsRateSupported(rate_support, thin, rate, NULL); + IMFRateSupport_Release(rate_support); + if (FAILED(hr)) + { + WARN("Sink %p does not support rate %f, hr %#x.\n", sink->sink, rate, hr); + break; + } + } + } + } + + LeaveCriticalSection(&session->cs); + + *nearest_rate = value; + + return hr; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -3560,9 +3634,11 @@ static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_supported_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return session_is_presentation_rate_supported(session, thin, rate, nearest_supported_rate); } static const IMFRateSupportVtbl session_rate_support_vtbl = -- 2.33.0

1 1

[PATCH] include: Add define SQL_OV_ODBC3_80
by Alistair Leslie-Hughes 08 Nov '21

08 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index ba799a36bb3..51e76a5a856 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -64,6 +64,7 @@ extern "C" { #define SQL_OV_ODBC2 __MSABI_LONG(2U) #define SQL_OV_ODBC3 __MSABI_LONG(3U) +#define SQL_OV_ODBC3_80 __MSABI_LONG(380U) #endif #define SQL_ACCESS_MODE 101 -- 2.33.0

1 0

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification
by David Gow 08 Nov '21

08 Nov '21

In reply to Andrew Eikum: > > Signed-off-by: Andrew Eikum <aeikum at codeweavers.com> > --- > > For example, > > "%*0d", 1, ... > > becomes > > "%10d", ... > > i.e. prints ten digits. This doesn't seem to be correct to me. I've written a test program and built it with MSVC 2019: int main(int argc, char **argv) { printf("%0*02d\n",1,0); printf("%0*02d\n",30,17); printf("%*1d\n", 1, 3); printf("%0*0d\n", 1, 2); printf("% *2d\n", 0, 7); return 0; } The output on windows (and wine with native ucrtbase.dll) is: 00 17 3 2 7 The output with this patch is notably different: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 <absurd number of zeros elided>0000017 3 0000000002 7 I've uploaded a binary for said test program here: https://davidgow.net/stuff/TestPrintf.exe Similarly, Age of Empires IV shows an incorrect timer with this patch (the text under "Gold Medal (Goal…)" should read 00:17): https://davidgow.net/stuff/aoe4-printf-bigtime.jpg This diff to the patch fixes these issues (though it doesn't update the tests): diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 40a8a13d861..6df7fd66156 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,6 +1050,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; } while (*p >= '0' && *p <= '9') { Cheers, -- David

2 2

[PATCH] add xinputuap.dll(fixed)
by Yusuf Khan 07 Nov '21

07 Nov '21

2 1

[PATCH v2 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index d093c3c2087..9b75f40a741 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

1 0

[PATCH v2 5/6] msdasql: Correct default dialect logic
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 98a1fc50220..e52e8cd18d8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -847,7 +847,7 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec struct command *command = impl_from_ICommandText( iface ); TRACE("%p, %s, %s\n", command, debugstr_guid(dialect), debugstr_w(commandstr)); - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); heap_free(command->query); -- 2.33.0

1 0

[PATCH v2 4/6] msdasql: Trace session interfaces.
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 10 ++++++++++ dlls/msdasql/tests/provider.c | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0298c7e7424..98a1fc50220 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -102,6 +102,16 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_IBindResource, riid)) + { + TRACE("(%p)->(IID_IBindResource not support)\n", iface); + return E_NOINTERFACE; + } + else if(IsEqualGUID(&IID_ICreateRow, riid)) + { + TRACE("(%p)->(IID_ICreateRow not support)\n", iface); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6ffe17e7028..d093c3c2087 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -367,6 +367,8 @@ static void test_sessions(void) IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; + IUnknown *unimplemented = NULL; + ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -415,6 +417,17 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionJoin_Release(join); + + hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_ICreateRow, (void**)&unimplemented); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); ok(hr == S_OK, "got 0x%08x\n", hr); ISessionProperties_Release(session_props); -- 2.33.0

1 0

[PATCH v2 3/6] include: Add trnjoi.idl
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 28 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnjoi.idl | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/trnjoi.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8910070fbac..dc0f2261096 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1741,3 +1741,31 @@ HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithPar FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionJoin_GetOptionsObject_Stub(ITransactionJoin* This, + ITransactionOptions **options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_GetOptionsObject_Proxy(ITransactionJoin *This, + ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionJoin_JoinTransaction_Stub(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options, IErrorInfo **error) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p, %p): stub\n", This, unk, level, flags, options, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, IUnknown *unk, + ISOLEVEL level, ULONG flags, ITransactionOptions *options) +{ + FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index a16cba52642..8c4eb732e57 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -720,6 +720,7 @@ SOURCES = \ tpcshrd.h \ traffic.h \ transact.idl \ + trnjoi.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index b889d72bc38..abd4d55069c 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -80,6 +80,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstupd.idl" #include "mulres.idl" #include "transact.idl" +#include "trnjoi.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnjoi.idl b/include/trnjoi.idl new file mode 100644 index 00000000000..fcc22ce5ea3 --- /dev/null +++ b/include/trnjoi.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2021 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5e-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionJoin : IUnknown +{ + [local] + HRESULT GetOptionsObject(ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **error); + + [local] + HRESULT JoinTransaction(IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, ITransactionOptions *options); + + [call_as(JoinTransaction)] + HRESULT RemoteJoinTransaction([in, unique] IUnknown *unk, [in] ISOLEVEL level, [in] ULONG flags, + [in] ITransactionOptions *options, [out] IErrorInfo **error); +} -- 2.33.0

1 0

[PATCH v2 1/6] msdasql: Implement IDBProperties SetProperties
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl = -- 2.33.0

1 0

[PATCH 6/6] msdasql: Fix use after free (Coverity)
by Alistair Leslie-Hughes 07 Nov '21

07 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 63a51c6f60e..61b5dfc807d 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -130,8 +130,8 @@ static void test_Properties(void) hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); - ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propidlist.cPropertyIDs); + ok(propset->cProperties == 14, "got %d\n", propset->cProperties); for (i = 0; i < propidlist.cPropertyIDs; i++) { -- 2.33.0

2 1