wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

[PATCH 5/6] jscript: Pass string as jsstr_t to push_instr_str.
by Jacek Caban 01 Mar '19

01 Mar '19

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

1 0

[PATCH 4/6] jscript: Return regexp string as jsstr_t from lexer.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 24 +++++------------------- dlls/jscript/lex.c | 3 +-- dlls/jscript/parser.h | 8 +++++--- dlls/jscript/parser.y | 5 ++++- 4 files changed, 15 insertions(+), 25 deletions(-)

1 0

[PATCH 6/6] jscript: Add support for string literals with embedded null bytes.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/lex.c | 34 +++++++++++++++++++++------------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 12 ++++++------ dlls/jscript/tests/lang.js | 3 +++ 5 files changed, 33 insertions(+), 22 deletions(-)

1 0

[PATCH 3/6] jscript: Support embedded null bytes in unescape.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 4 ++-- dlls/jscript/lex.c | 25 +++++++++++++++---------- dlls/jscript/parser.h | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH 2/6] jscript: Use jsstr_t as string argument type in OP_obj_prop.
by Jacek Caban 01 Mar '19

01 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 39 ++++++++++++++++++++------------------- dlls/jscript/engine.c | 8 ++++++-- dlls/jscript/engine.h | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-)

1 0

[PATCH 1/6] jscript/tests: Allow GetTypeInfo calls.
by Jacek Caban 01 Mar '19

01 Mar '19

Those are called by some versions of jscript.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH v2 3/3] dnsapi: No longer prefer native.
by Hans Leidekker 01 Mar '19

01 Mar '19

v2: Get rid of DllMain. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2302..6cb3b493b7 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - /****************************************************************************** * DnsAcquireContextHandle_A [DNSAPI.@] * -- 2.11.0

1 0

[PATCH v2 2/3] dnsapi: Fix data length returned for records that contain Unicode strings.
by Hans Leidekker 01 Mar '19

01 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17af64..dc6a1137d9 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include <stdarg.h> #include <stdio.h> @@ -480,6 +481,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.MINFO.pNameMailbox ); goto error; } + + dst->wDataLength = sizeof(dst->Data.MINFO); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -489,6 +495,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.MX.pNameExchange = dns_strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; + + dst->wDataLength = sizeof(dst->Data.MX); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -496,6 +506,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.NXT.pNameNext = dns_strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; + + dst->wDataLength = sizeof(dst->Data.NXT); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -510,6 +524,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.PTR.pNameHost = dns_strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; + + dst->wDataLength = sizeof(dst->Data.PTR); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -517,6 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SIG.pNameSigner = dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; + + dst->wDataLength = sizeof(dst->Data.SIG); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -532,6 +554,11 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET heap_free( dst->Data.SOA.pNamePrimaryServer ); goto error; } + + dst->wDataLength = sizeof(dst->Data.SOA); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -539,6 +566,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->Data.SRV.pNameTarget = dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; + + dst->wDataLength = sizeof(dst->Data.SRV); + if (out == DnsCharSetUnicode) dst->wDataLength += + (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.11.0

1 0

[PATCH v2 1/3] dnsapi: Add support for DNS_TYPE_OPT records.
by Hans Leidekker 01 Mar '19

01 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 10 ++++++++++ dlls/dnsapi/record.c | 10 ++++++++++ include/windns.h | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 19eecfded1..e601191c5d 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -218,6 +218,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) break; } case ns_t_null: + case ns_t_opt: { size += rr->rdlength - 1; break; @@ -313,6 +314,15 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; break; } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } case ns_t_cname: case ns_t_ns: case ns_t_mb: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 7882b2290f..8d7b17af64 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -222,6 +222,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; break; } + case DNS_TYPE_OPT: + { + if (r1->Data.Opt.wDataLength != r2->Data.Opt.wDataLength) + return FALSE; + /* ignore wPad */ + if (memcmp( r1->Data.Opt.Data, + r2->Data.Opt.Data, r1->Data.Opt.wDataLength )) + return FALSE; + break; + } case DNS_TYPE_AAAA: { for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) diff --git a/include/windns.h b/include/windns.h index f150919b42..d9a4b9adb0 100644 --- a/include/windns.h +++ b/include/windns.h @@ -519,6 +519,14 @@ typedef struct DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA) DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA) +typedef struct +{ + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} +DNS_OPT_DATA, *PDNS_OPT_DATA; + typedef struct _DnsRecordA { struct _DnsRecordA *pNext; @@ -552,6 +560,7 @@ typedef struct _DnsRecordA DNS_TSIG_DATAA TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDA, *PDNS_RECORDA; @@ -588,6 +597,7 @@ typedef struct _DnsRecordW DNS_TSIG_DATAW TSIG, Tsig; DNS_WINS_DATA WINS, Wins; DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + DNS_OPT_DATA OPT, Opt; } Data; } DNS_RECORDW, *PDNS_RECORDW; -- 2.11.0

1 0

[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.
by Dmitry Timoshkov 01 Mar '19

01 Mar '19

Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd038..f163235138 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h" -- 2.20.1

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2019