- Wine-Devel - list.winehq.org

[PATCH] xactengine3_7: Add a trailing linefeed to ERR() messages.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/xactengine3_7/xact_dll.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..3fbb4875930 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -253,7 +253,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -295,7 +295,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -585,7 +585,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -870,7 +870,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, if (!sb) { FACTSoundBank_Destroy(fsb); - ERR("Failed to allocate XACT3SoundBankImpl!"); + ERR("Failed to allocate XACT3SoundBankImpl!\n"); return E_OUTOFMEMORY; } @@ -907,7 +907,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } @@ -955,7 +955,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } -- 2.20.1

1 0

[PATCH] libwine: Use NULL instead of casting 0.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It's a matter of taste I guess, but it's what NULL is here for. libs/wine/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index d6fb88f8eca..16bb97bec8e 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -479,7 +479,7 @@ noconv: long int atolW( const WCHAR *str ) { - return strtolW( str, (WCHAR **)0, 10 ); + return strtolW( str, NULL, 10 ); } int atoiW( const WCHAR *str ) -- 2.20.1

1 0

[PATCH] conhost: Add a trailing linefeed to TRACE() and ERR() messages.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 01917ee8b67..a665cbb84d4 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -285,7 +285,7 @@ static void save_registry_key( HKEY key, const struct console_config *config ) DWORD val, width, height, i; WCHAR color_name[13]; - TRACE( "%s", debugstr_config( config )); + TRACE( "%s\n", debugstr_config( config )); for (i = 0; i < ARRAY_SIZE(config->color_map); i++) { @@ -870,7 +870,7 @@ static void update_console_font( struct console *console, const WCHAR *font, EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); if (fc.done) return; } - ERR( "Couldn't find a decent font" ); + ERR( "Couldn't find a decent font\n" ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ -- 2.20.1

1 0

[PATCH] widl: Fix missing delegate declaration namespace.
by Rémi Bernon March 2, 2021

March 2, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typetree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a1e7abc31e5..591a58b2849 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -901,7 +901,7 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref type_t *type_delegate_declare(char *name, struct namespace *namespace) { - type_t *type = get_type(TYPE_DELEGATE, name, NULL, 0); + type_t *type = get_type(TYPE_DELEGATE, name, namespace, 0); if (type_get_type_detect_alias(type) != TYPE_DELEGATE) error_loc("delegate %s previously not declared a delegate at %s:%d\n", type->name, type->loc_info.input_name, type->loc_info.line_number); -- 2.30.0

2 1

[PATCH] fsutil/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/fsutil/tests/fsutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index eff47a4f8ec..aa0d5d3884b 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -100,7 +100,7 @@ static void test_hardlink(void) ok(boolrc, "failed to get info about hardlink, error %#x\n", GetLastError()); CloseHandle(hfile); - ok(info.nNumberOfLinks == 2, "our link is not a hardlink"); + ok(info.nNumberOfLinks == 2, "our link is not a hardlink\n"); rc = runcmd("fsutil hardlink create link file"); ok(rc == 1, "fsutil didn't complain about already existing destination\n"); -- 2.20.1

1 0

[PATCH] winegcc: Add a trailing linefeed to an error() message.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c812af48670..9297a9b75bd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1679,7 +1679,7 @@ int main(int argc, char **argv) strarray_add( opts.args, argv[i] ); continue; } - if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s", argv[i] + 1 ); + if ((fstat( fd, &st ) == -1)) error( "Cannot stat %s\n", argv[i] + 1 ); if (st.st_size) { input_buffer = xmalloc( st.st_size + 1 ); -- 2.20.1

1 0

[PATCH] wrc: Remove the trailing linefeed from a parser_error() message.
by Francois Gouget March 2, 2021

March 2, 2021

Unlike most other trace and error reporting functions, parser_error() appends a linefeed to the error message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/wrc/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 3ee7eb4a96a..f0cec77945e 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -429,7 +429,7 @@ L\" { yy_push_state(tklstr); wbufidx = 0; if(!win32) - parser_error("16bit resource contains unicode strings\n"); + parser_error("16bit resource contains unicode strings"); } <tklstr>\"{ws}+ | <tklstr>\" { -- 2.20.1

1 0

[PATCH] msado15: Fix the name of the command_text variable.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msado15/connection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 80297dcdc16..a3c9a450be6 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -339,7 +339,7 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI { struct connection *connection = impl_from_Connection( iface ); HRESULT hr; - ICommandText *comand_text; + ICommandText *command_text; DBROWCOUNT affected; IUnknown *rowset; _Recordset *recordset; @@ -349,12 +349,12 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - hr = create_command_text(connection->session, command, &comand_text); + hr = create_command_text(connection->session, command, &command_text); if (FAILED(hr)) return hr; - hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); - ICommandText_Release(comand_text); + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); if (FAILED(hr)) return hr; -- 2.20.1

1 0

[PATCH] advapi32/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f43ac2431e1..a8c1a80e419 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8008,12 +8008,12 @@ static void test_GetKernelObjectSecurity(void) ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(!present, "expeced no DACL present\n"); + todo_wine ok(!present, "expected no DACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); ok(ret, "got error %u\n", GetLastError()); - ok(!present, "expeced no SACL present\n"); + ok(!present, "expected no SACL present\n"); /* the descriptor is defaulted only on Windows >= 7 */ free(sd); -- 2.20.1

1 0

[PATCH] odbccp32/tests: Fix the spelling of a comment.
by Francois Gouget March 2, 2021

March 2, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index f52dcee7acd..ec706f57f06 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -831,7 +831,7 @@ static void test_SQLWriteDSNToIni(void) ok(ret, "got %d\n", ret); } - /* Show that values are writen, even though an invalid driver was specified. */ + /* Show that values are written, even though an invalid driver was specified. */ ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); ok(ret, "got %d\n", ret); if(ret) -- 2.20.1

1 0