November 2020 - Wine-commits

Francois Gouget : msxml3/tests: Fix the spelling of a test string.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 251a2b955a04dce6b8c5ab1f9f529f193ec52a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=251a2b955a04dce6b8c5ab1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 30 16:23:19 2020 +0100 msxml3/tests: Fix the spelling of a test string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e27754d457a..e94a2c88a81 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5877,7 +5877,7 @@ static void test_xmlTypes(void) } /* CData Section */ - str = SysAllocString(L"[1]*2=3; &gee thats not right!"); + str = SysAllocString(L"[1]*2=3; &gee that is not right!"); hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -5904,7 +5904,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee thats not right!]]>" ), "incorrect cdata xml\n"); + ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee that is not right!]]>" ), "incorrect cdata xml\n"); SysFreeString(str); /* test lastChild */

1 0

Jacek Caban : mshtml: Update to Wine Gecko 2.47.2.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 70567d9f2d32fa3f052609051e9913344f24c42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70567d9f2d32fa3f05260905… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 16:56:52 2020 +0100 mshtml: Update to Wine Gecko 2.47.2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 67d61ea0d22..cfc51155f57 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -45,13 +45,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47.1" +#define GECKO_VERSION "2.47.2" #ifdef __i386__ #define GECKO_ARCH "x86" -#define GECKO_SHA "f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051" +#define GECKO_SHA "e520ce7336cd420cd09c91337d87e74bb420300fd5cbc6f724c1802766b6a61d" #elif defined(__x86_64__) #define GECKO_ARCH "x86_64" -#define GECKO_SHA "69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a" +#define GECKO_SHA "0596761024823ff3c21f13e1cd5cd3e89dccc698294d62974d8930aeda86ce45" #else #define GECKO_ARCH "" #define GECKO_SHA "???" diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index af83b6a4380..a621007b0cc 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47.1\"") +cpp_quote("#define GECKO_VERSION \"2.47.2\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl";

1 0

Michael Stefaniuc : cmd: Avoid casting a const away.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 77fc01d39d732acf26658f13448739eeaf00de45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fc01d39d732acf26658f13… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:27 2020 +0100 cmd: Avoid casting a const away. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 934e55ac587..c6dce091c69 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1968,6 +1968,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, BOOL thisduplicate = FALSE; BOOL anyduplicates = FALSE; int totalfound; + static WCHAR emptyW[] = L""; /* Skip lines if requested */ if (*forf_skip) { @@ -1998,7 +1999,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, for (varoffset=0; varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26); varoffset++) { - forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW; + forloopcontext.variable[varidx + varoffset] = emptyW; } /* Loop extracting the tokens @@ -2048,7 +2049,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, int i; for (i=varidx; i<MAX_FOR_VARIABLES; i++) { if ((forloopcontext.variable[i] != oldcontext.variable[i]) && - (forloopcontext.variable[i] != nullW)) { + (forloopcontext.variable[i] != emptyW)) { heap_free(forloopcontext.variable[i]); } }

1 0

Michael Stefaniuc : cmd: Inline some simple extern WCHAR strings.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 9fcb2b097c3fd38a5be309b9c16b4a10b43b694c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fcb2b097c3fd38a5be309b9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:28 2020 +0100 cmd: Inline some simple extern WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 20 +++++++------- programs/cmd/builtins.c | 72 ++++++++++++++++++++---------------------------- programs/cmd/directory.c | 34 +++++++++++------------ programs/cmd/wcmd.h | 8 ------ programs/cmd/wcmdmain.c | 21 ++++++-------- 5 files changed, 66 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fcb2b097c3fd38a5be3…

1 0

Michael Stefaniuc : cmd: Use wide-char string literals in builtins.c.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: a158bf7e9c322f03894a9990a1ea1aa48f12f1ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a158bf7e9c322f03894a9990… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:29 2020 +0100 cmd: Use wide-char string literals in builtins.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 386 +++++++++++++++++++----------------------------- 1 file changed, 149 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a158bf7e9c322f03894a…

1 0

Michael Stefaniuc : cmd: Use wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 40ce3c5b60e1330d59f3551df222cc0a7a1b222b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40ce3c5b60e1330d59f3551d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:30 2020 +0100 cmd: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/directory.c | 21 ++++----- programs/cmd/wcmdmain.c | 116 ++++++++++++++++------------------------------- 2 files changed, 46 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40ce3c5b60e1330d59f3…

1 0

Esme Povirk : windowscodecs: Move ICNS encoding to the unix lib.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 769d88a39e8c2c6c1d4ec7e1cb96ad8baa4bb2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769d88a39e8c2c6c1d4ec7e1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Nov 29 16:13:15 2020 -0600 windowscodecs: Move ICNS encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/encoder.c | 26 ++ dlls/windowscodecs/icnsencoder.c | 295 +++++++++++++ dlls/windowscodecs/icnsformat.c | 742 --------------------------------- dlls/windowscodecs/main.c | 14 + dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 4 + 8 files changed, 344 insertions(+), 744 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=769d88a39e8c2c6c1d4e…

1 0

Alexandre Julliard : windowscodecs: Build with msvcrt.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 0012c26fa6136cbf7080b3fc53f872c748fcbca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0012c26fa6136cbf7080b3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 21:02:21 2020 +0100 windowscodecs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 ++ dlls/windowscodecs/bitmap.c | 2 -- dlls/windowscodecs/bmpdecode.c | 2 -- dlls/windowscodecs/bmpencode.c | 2 -- dlls/windowscodecs/clsfactory.c | 2 -- dlls/windowscodecs/colorcontext.c | 2 -- dlls/windowscodecs/colortransform.c | 2 -- dlls/windowscodecs/converter.c | 2 -- dlls/windowscodecs/ddsformat.c | 3 --- dlls/windowscodecs/decoder.c | 3 --- dlls/windowscodecs/encoder.c | 3 --- dlls/windowscodecs/fliprotate.c | 2 -- dlls/windowscodecs/gifformat.c | 2 -- dlls/windowscodecs/icoformat.c | 2 -- dlls/windowscodecs/imgfactory.c | 2 -- dlls/windowscodecs/info.c | 13 +++++-------- dlls/windowscodecs/main.c | 1 - dlls/windowscodecs/metadatahandler.c | 2 -- dlls/windowscodecs/metadataquery.c | 15 +++++++-------- dlls/windowscodecs/palette.c | 2 -- dlls/windowscodecs/pngformat.c | 3 --- dlls/windowscodecs/propertybag.c | 9 +++------ dlls/windowscodecs/proxy.c | 2 -- dlls/windowscodecs/regsvr.c | 7 +++---- dlls/windowscodecs/scaler.c | 2 -- dlls/windowscodecs/tgaformat.c | 3 --- dlls/windowscodecs/unix_iface.c | 3 --- dlls/windowscodecs/wincodecs_private.h | 7 +++---- 28 files changed, 23 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0012c26fa6136cbf7080…

1 0

Michael Stefaniuc : urlmon: Use wide-char string literals in struct initialization.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 92825628771e79e33f84531001bb86695808feac URL: https://source.winehq.org/git/wine.git/?a=commit;h=92825628771e79e33f845310… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 27 23:24:51 2020 +0100 urlmon: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 9 ++-- dlls/urlmon/internet.c | 119 +++++++++++----------------------------------- dlls/urlmon/mimefilter.c | 74 ++++++++++------------------ dlls/urlmon/uri.c | 58 +++++++++++----------- dlls/urlmon/urlmon_main.c | 19 +++----- 5 files changed, 93 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92825628771e79e33f84…

1 0

Jacek Caban : server: Remove no longer needed free_console.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 23e7b859a11cfe715ffc1ef899149a026870f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e7b859a11cfe715ffc1ef8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:42:02 2020 +0100 server: Remove no longer needed free_console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 +++++++----------------------- server/process.c | 4 +--- server/process.h | 1 - 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/server/console.c b/server/console.c index 295db7767b2..0e779c77816 100644 --- a/server/console.c +++ b/server/console.c @@ -55,7 +55,6 @@ struct console { struct object obj; /* object header */ int signaled; /* is console signaled */ - int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ struct screen_buffer *active; /* active screen buffer */ struct console_server *server; /* console server object */ @@ -513,7 +512,6 @@ static struct object *create_console(void) console->renderer = NULL; console->signaled = 0; - console->num_proc = 0; console->active = NULL; console->server = NULL; console->fd = NULL; @@ -635,20 +633,6 @@ static struct object *create_screen_buffer( struct console *console ) return &screen_buffer->obj; } -/* free the console for this process */ -int free_console( struct process *process ) -{ - struct console *console = process->console; - - if (!console) return 0; - - process->console = NULL; - console->num_proc--; - release_object( console ); - - return 1; -} - struct thread *console_get_renderer( struct console *console ) { return console->renderer; @@ -755,10 +739,7 @@ static struct object *create_console_connection( struct console *console ) } if (console) - { current->process->console = (struct console *)grab_object( console ); - console->num_proc++; - } return &connection->obj; } @@ -1072,10 +1053,7 @@ static int console_connection_ioctl( struct fd *fd, ioctl_code_t code, struct as if (!(process = get_process_from_id( pid ))) return 0; if (process->console) - { current->process->console = (struct console *)grab_object( process->console ); - process->console->num_proc++; - } else set_error( STATUS_ACCESS_DENIED ); release_object( process ); return !get_error(); @@ -1200,7 +1178,13 @@ static struct object *console_connection_open_file( struct object *obj, unsigned static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { - free_console( process ); + struct console *console = process->console; + + if (console) + { + process->console = NULL; + release_object( console ); + } return 1; } diff --git a/server/process.c b/server/process.c index 5b3e29e5dfd..4a366b4d3b0 100644 --- a/server/process.c +++ b/server/process.c @@ -915,9 +915,7 @@ static void process_killed( struct process *process ) if (process->exe_file) release_object( process->exe_file ); process->idle_event = NULL; process->exe_file = NULL; - - /* close the console attached to this process, if any */ - free_console( process ); + assert( !process->console ); while ((ptr = list_head( &process->rawinput_devices ))) { diff --git a/server/process.h b/server/process.h index b4f3660d89a..374eda65b6b 100644 --- a/server/process.h +++ b/server/process.h @@ -132,7 +132,6 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console *console ); /* process tracing mechanism to use */

1 0