March 2021 - Wine-commits - list.winehq.org

Francois Gouget : wrc: Remove the trailing linefeed from a parser_error() message.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 55ba6262d219cfb7fe19450db4b22eba8e62a33f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ba6262d219cfb7fe19450d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:11:28 2021 +0100 wrc: Remove the trailing linefeed from a parser_error() message. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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>\" {

1 0

Francois Gouget : winegcc: Add a trailing linefeed to an error() message.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 5d80ee4b6001ba46a96954658a3466d9ff7d5513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d80ee4b6001ba46a9695465… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:11:53 2021 +0100 winegcc: Add a trailing linefeed to an error() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 );

1 0

Francois Gouget : fsutil/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 63958c1345351ccc5631ddc1a9bf6dddd6c698f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63958c1345351ccc5631ddc1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:12:51 2021 +0100 fsutil/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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");

1 0

Francois Gouget : conhost: Add a trailing linefeed to TRACE() and ERR() messages.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: e0d1bec91617b43623b5f7715f1eebe4c310cb7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d1bec91617b43623b5f771… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:14:34 2021 +0100 conhost: Add a trailing linefeed to TRACE() and ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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) */

1 0

Francois Gouget : libwine: Use NULL instead of casting 0.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 0fd41648e3c0546916be4ae4f4fb3d9768b5ee99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd41648e3c0546916be4ae4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:18:06 2021 +0100 libwine: Use NULL instead of casting 0. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 )

1 0

Alexandre Julliard : msimtf: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 88b5c28dbb8ff09d4c1723578c9de733fd7caeb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b5c28dbb8ff09d4c172357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:58 2021 +0100 msimtf: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/Makefile.in | 2 +- dlls/msimtf/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index 800969ca60f..7e018cac86d 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -1,7 +1,7 @@ MODULE = msimtf.dll IMPORTS = uuid imm32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ activeimmapp.c \ diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 76ad6548f4b..c5d3e8b9f32 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);

1 0

Alexandre Julliard : netcfgx: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 8af301140ccd18af511a72687c63d38e53d4a8b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af301140ccd18af511a7268… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:04 2021 +0100 netcfgx: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/Makefile.in | 2 +- dlls/netcfgx/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index d4dae8f318d..99302ef2672 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,7 +1,7 @@ MODULE = netcfgx.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index 0a3102a81fc..f7373599554 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -128,8 +128,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0

Alexandre Julliard : netprofm: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: ff798c087291616af13371816fff4a4721c0a1ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff798c087291616af1337181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:09 2021 +0100 netprofm: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/Makefile.in | 2 +- dlls/netprofm/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index d57d1d60c45..951ca67bf80 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,7 +1,7 @@ MODULE = netprofm.dll IMPORTS = iphlpapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ list.c \ diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index d1e622f0878..1763080ec3f 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst );

1 0

Alexandre Julliard : propsys: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: f99113192ffac37506a905827415d3d21d0ebbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99113192ffac37506a90582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:15 2021 +0100 propsys: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 2 +- dlls/propsys/propsys_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index ec0b223cc92..d8a7a7888bb 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -2,7 +2,7 @@ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ propstore.c \ diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 91ebc62127a..ee67ab35f17 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -42,8 +42,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: propsys_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Alexandre Julliard : qdvd: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: aeaf884a47c4a9061959f5db6a08d0c20281388e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeaf884a47c4a9061959f5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:55:21 2021 +0100 qdvd: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 2 +- dlls/qdvd/qdvd_main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index bda22a79074..85f88675b21 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,7 +1,7 @@ MODULE = qdvd.dll IMPORTS = strmbase strmiids uuid ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ graph.c \ diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 2fdb108877d..cf0620511cc 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -104,9 +104,6 @@ static struct class_factory navigator_cf = {{&class_factory_vtbl}, navigator_cre BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_WINE_PREATTACH) - return FALSE; /* prefer native version */ - if (reason == DLL_PROCESS_ATTACH) { qdvd_instance = instance;

1 0