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

[PATCH] msvcrt: printf: Later width specifiers should override earlier ones

by David Gow

From: Andrew Eikum <aeikum(a)codeweavers.com> This is a replacement for "msvcrt: The '*' character should be interpreted as the beginning of the width specification"[1], which matches the behaviour I see on my machine better. If a printf format string contains both a '*' (to specify that the field width should be read from a variable), followed by another explicit field width, only the latter field width should be used. For further details, see [2] and [3]. [1]: https://source.winehq.org/patches/data/218904 [2]: https://www.winehq.org/pipermail/wine-devel/2021-November/200039.html [3]: https://github.com/ValveSoftware/Proton/issues/5258#issuecomment-962423092 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Co-Developed-by: David Gow <david(a)davidgow.net> Signed-off-by: David Gow <david(a)davidgow.net> --- Note also that this moves the new tests after the setlocale(LC_ALL, "C"), as I don't think they need to run in a Japanese locale. --- dlls/msvcrt/printf.h | 8 +++++++- dlls/msvcrt/tests/printf.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..6d2f02ee85b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + + /* Ignore this length if there's another specifier. */ + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; + } + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..cc824f571a6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,26 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%0*02d", 1, 0); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "00"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*02d", 30, 17); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, "17"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) -- 2.32.0

Nov. 8, 2021

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification

by David Gow

(Apologies if you get this twice: the list bounced my first attempt. I've subscribed now, which should help.) In reply to Andrew Eikum: > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > For example, > > "%*0d", 1, ... > > becomes > > "%10d", ... > > i.e. prints ten digits. This doesn't seem to be quite 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 I'll send an updated patch through which fixes this soon. Cheers, -- David

Nov. 8, 2021

Re: [PATCH v3 2/3] mshtml: Implement inline attributes parsing for createElement.

by Gabriel Ivăncescu

On 06/11/2021 21:19, Jacek Caban wrote: > On 11/6/21 2:46 PM, Gabriel Ivăncescu wrote: >> I thought of another idea, which I don't think is necessarily better, >> but maybe it's worth a thought. >> >> We could iterate through a bunch of root context tags, namely >> <template>, <head> and <html> in that order, then use setInnerHTML on >> them and retrieve the first child, until we get a child and then use >> that if we did. >> >> I guess <html> context might be tricky here, since it can be either >> <head> or <body> tag that is parsed, might need some special casing >> (and retrieve either first or second child in such case, perhaps we >> can just check the first letter since other tags should already work >> in either <template> or <head> themselves—so would have been filtered >> already). >> >> Just an idea. Is it worth pursuing? > > > The whole thing is still too hacky, in my opinion. If we can't get Gecko > to do what we need, maybe we need to do parsing ourselves. Given that we > only need to parse a small subset of HTML, it shouldn't be too bad and > all we need from Gecko is createElement() and setAttribute(). > > > Thanks, > > Jacek > Hi Jacek, I think parsing it ourselves might be somewhat complicated, because of stuff like the HTML escapes (e.g. " " & and so on), which would have to be handled as the tests show. A mixed way would be a simpler version of the first patch that goes roughly like the following. For this case, let's assume we want to create the <body a="b"> element, so: The first two steps are needed regardless of whether we parse it ourselves or not: 1) Parse its tag name ("body") 2) Create a <body> element Then: 3) Create a <template> element, and setInnerHTML to <foo a="b"> 4) Get its first child 5) Loop through all attributes on the child and set them on the element we created in (2) This is pretty much like first patch but simplified to <template> and allows gecko to parse it for us. Do you think it's feasible? If not, do you have some suggestions how I should implement the escapes? I guess a table? Thanks, Gabriel

Nov. 7, 2021

Re: [PATCH] add xinputuap.dll(fixed)

by Rémi Bernon

On 11/3/21 02:20, Yusuf Khan wrote: > Hi Yusuf, You don't need to (and probably shouldn't) commit the changes to configure, only configure.ac changes are needed. The maintainer will regenerate configure themselves and commit the changes to ensure that consistent autoconf version is used. Regarding the DLL, it seems like it's supposed to be used by UWP applications which Wine doesn't really support yet, do you have more info about which application requires it? Also, I believe it normally exports a few more functions. According to https://windows10dll.nirsoft.net/xinputuap_dll.html, it should probably export or stub these as well: XInputEnable XInputGetAudioDeviceIds XInputGetBatteryInformation XInputGetCapabilities XInputGetKeystroke XInputGetState XInputSetState Cheers, -- Rémi Bernon <rbernon(a)codeweavers.com>

Nov. 7, 2021

Re: [PATCH] msvcrt: The '*' character should be interpreted as the beginning of the width specification

by David Gow

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

Nov. 7, 2021

[PATCH v2 6/6] msdasql: Fix use after free (Coverity)

by Alistair Leslie-Hughes

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

Nov. 7, 2021

[PATCH v2 5/6] msdasql: Correct default dialect logic

by Alistair Leslie-Hughes

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

Nov. 7, 2021

[PATCH v2 4/6] msdasql: Trace session interfaces.

by Alistair Leslie-Hughes

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

Nov. 7, 2021

[PATCH v2 3/6] include: Add trnjoi.idl

by Alistair Leslie-Hughes

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

Nov. 7, 2021

[PATCH v2 2/6] include: Add transact.idl to oledb.idl

by Alistair Leslie-Hughes

Since uuid.lib includes oledb.h, we get duplicate symbols in adsiid since uuid.lib is linked. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + libs/adsiid/adsiid.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oledb.idl b/include/oledb.idl index 49c0c304b2d..b889d72bc38 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "transact.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/libs/adsiid/adsiid.c b/libs/adsiid/adsiid.c index fc0b8b1bf4e..e4e85d89b84 100644 --- a/libs/adsiid/adsiid.c +++ b/libs/adsiid/adsiid.c @@ -25,4 +25,3 @@ #include "initguid.h" #include "iads.h" -#include "transact.h" -- 2.33.0

Nov. 7, 2021