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

[PATCH 1/5] include: Add missing SECBUFFER defines.
by Hans Leidekker 10 Mar '21

10 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/sspi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index e7371f129de..1cd1e6e0035 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -201,7 +201,9 @@ typedef struct _SecBuffer #define SECBUFFER_MECHLIST_SIGNATURE 12 #define SECBUFFER_TARGET 13 #define SECBUFFER_CHANNEL_BINDINGS 14 +#define SECBUFFER_ALERT 17 #define SECBUFFER_APPLICATION_PROTOCOLS 18 +#define SECBUFFER_DTLS_MTU 24 #define SECBUFFER_ATTRMASK 0xf0000000 #define SECBUFFER_READONLY 0x80000000 -- 2.30.1

1 0

[PATCH 2/2] jscript: Improve prop_get and prop_put debug traces.
by Jacek Caban 10 Mar '21

10 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] jscript: Print source location in backtraces.
by Jacek Caban 10 Mar '21

10 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 5 +++-- dlls/jscript/engine.h | 2 ++ dlls/jscript/jscript.c | 14 ++++---------- 4 files changed, 23 insertions(+), 12 deletions(-)

1 0

[PATCH 4/6] mshtml: Add IHTMLElement7::spellcheck property implementation.
by Jacek Caban 10 Mar '21

10 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 4 deletions(-)

1 0

[PATCH 2/6] mshtml: Add IHTMLElement7 stub implementation.
by Jacek Caban 10 Mar '21

10 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 499 +++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 501 insertions(+)

1 0

[PATCH 1/6] include: Add IHTMLElement7 declaration.
by Jacek Caban 10 Mar '21

10 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 35 +++++ include/mshtml.idl | 353 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 382 insertions(+), 6 deletions(-)

1 0

[PATCH v3] winspool: Filter invalid characters when creating the PPD filename.
by Huw Davies 10 Mar '21

10 Mar '21

From: Owen Rudge <orudge(a)codeweavers.com> Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb9c1599d38..4d0542d20e3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,13 +721,18 @@ fail: static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - int len = (strlenW( dir ) + strlenW( file_name )) * sizeof(WCHAR) + sizeof(dot_ppd); - WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ); + static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; + int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); + WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; if (!ppd) return NULL; - strcpyW( ppd, dir ); - strcatW( ppd, file_name ); - strcatW( ppd, dot_ppd ); + memcpy( ppd, dir, dir_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len, file_name, file_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); + + p = ppd + dir_len; + while ((p = strpbrkW( p, invalid_chars ))) *p++ = '_'; return ppd; } -- 2.23.0

1 0

[PATCH 1/3] reg/tests: Try deleting strings containing escaped null characters
by Hugh McMaster 10 Mar '21

10 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/delete.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index fff3c5348b8..ee2257d42c5 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -100,6 +100,22 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "\\foo\\bar"); + add_value(hkey, "string\\01", REG_SZ, "Value", 6); + add_value(hkey, "string2", REG_SZ, "foo\\0bar", 9); + add_value(hkey, "\\0", REG_SZ, "Value", 6); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string\\01 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string\\01"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v string2 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "string2"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\0"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); -- 2.30.1

1 2

[PATCH v2] winspool: Filter invalid characters when creating the PPD filename.
by Huw Davies 10 Mar '21

10 Mar '21

From: Owen Rudge <orudge(a)codeweavers.com> Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb9c1599d38..ed55761e29b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,13 +721,18 @@ fail: static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - int len = (strlenW( dir ) + strlenW( file_name )) * sizeof(WCHAR) + sizeof(dot_ppd); - WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ); + static const WCHAR escape_chars[] = {'*','/','\\',0}; + int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); + WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; if (!ppd) return NULL; - strcpyW( ppd, dir ); - strcatW( ppd, file_name ); - strcatW( ppd, dot_ppd ); + memcpy( ppd, dir, dir_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len, file_name, file_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); + + p = ppd + dir_len; + while ((p = strpbrkW( p, escape_chars ))) *p++ = '_'; return ppd; } -- 2.23.0

2 2

[PATCH 1/1] winspool: Filter for invalid characters when creating PPD filename.
by Owen Rudge 10 Mar '21

10 Mar '21

Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/winspool.drv/info.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

2 1