wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Alexandre Julliard : Release 4.3.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 9422b844b59282db04af533451f50661de56b9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9422b844b59282db04af5334… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:40:42 2019 +0100 Release 4.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 831 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 456 insertions(+), 397 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9422b844b59282db04af…

1 0

Hans Leidekker : dnsapi: No longer prefer native.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: dde0313d9f0ef05c42c87964cde2edd1f7e763c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dde0313d9f0ef05c42c87964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:35 2019 +0100 dnsapi: No longer prefer native. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 93528a2..6cb3b49 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.@] *

1 0

Hans Leidekker : dnsapi: Fix data length returned for records that contain Unicode strings.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 0529e5b4b1ec45bc2f1a32b17003cb3f9e07410e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0529e5b4b1ec45bc2f1a32b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:34 2019 +0100 dnsapi: Fix data length returned for records that contain Unicode strings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 8d7b17a..dc6a113 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:

1 0

Hans Leidekker : dnsapi: Add support for DNS_TYPE_OPT records.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: ecaeaa974ce93fe0c51cf063a0828831a2be3dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecaeaa974ce93fe0c51cf063… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 1 17:37:33 2019 +0100 dnsapi: Add support for DNS_TYPE_OPT records. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 19eecfd..e601191 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 7882b22..8d7b17a 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 f150919..d9a4b9a 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;

1 0

Isira Seneviratne : po: Update German translation.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 563da6fe70e944b7101d4a47a8bf8a9969a9bfb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563da6fe70e944b7101d4a47… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Feb 27 09:12:25 2019 +0530 po: Update German translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1a2e965..802c5e1 100644 --- a/po/de.po +++ b/po/de.po @@ -5,14 +5,15 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-01-09 14:31+0100\n" -"Last-Translator: Julian Rüger\n" +"PO-Revision-Date: 2019-02-27 09:09+0530\n" +"Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 18.12.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -14873,7 +14874,7 @@ msgstr "Regulärer Metafile-Betrachter" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metadateien (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -16424,8 +16425,6 @@ msgid "Text documents (*.txt)" msgstr "Textdokumente (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Unicode-Textdokumente (*.txt)"

1 0

Dmitry Timoshkov : wpcap: Fix compilation with recent pcap/ pcap.h versions.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 40c9b46500c3606e966d5404d45b68a48609b6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c9b46500c3606e966d5404… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 28 20:37:47 2019 +0300 wpcap: Fix compilation with recent pcap/pcap.h versions. 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> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd..f163235 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"

1 0

Michael Stefaniuc : urlmon: Remove useless casts to self.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 554a804742955c644132dda6ba1480f60e116fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554a804742955c644132dda6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 21:39:47 2019 +0100 urlmon: Remove useless casts to self. 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/bindctx.c | 2 +- dlls/urlmon/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 2759f3d..6191751 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -45,7 +45,7 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) void *ret; HRESULT hres; - hres = IBindStatusCallback_QueryInterface(This->callback, riid, (void**)&ret); + hres = IBindStatusCallback_QueryInterface(This->callback, riid, &ret); if(FAILED(hres) && This->serv_prov) hres = IServiceProvider_QueryService(This->serv_prov, riid, riid, &ret); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 11e6ece..cc1ba81 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -434,7 +434,7 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_outer; *ppobj = &ret->IUnknown_outer; return S_OK;

1 0

Zebediah Figura : mshtml: Open pages in the native browser in HlinkTarget_Navigate().
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: f29317dcc23e2154809b751b17e65190a7e4d8f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29317dcc23e2154809b751b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 27 23:45:41 2019 -0600 mshtml: Open pages in the native browser in HlinkTarget_Navigate(). This matches native Windows behaviour as well, as demonstrated by running the interactive hlink:hlink tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44423 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b82750a..0607306 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "idispids.h" #include "mimeole.h" +#include "shellapi.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -1187,8 +1188,19 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + if(!This->doc_obj->client) { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + HRESULT hres; + BSTR uri; + + hres = IUri_GetAbsoluteUri(This->window->uri, &uri); + if (FAILED(hres)) + return hres; + + ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + SysFreeString(uri); + return S_OK; + } return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); }

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: f3457d6a8d0a8be80bbe8cb0a46d2ffaa56f2dac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3457d6a8d0a8be80bbe8cb0… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 1 11:18:13 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 399 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 230 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3457d6a8d0a8be80bbe…

1 0

Isira Seneviratne : kernel32: Fix LOCALE_SSCRIPTS value for Sinhala.
by Alexandre Julliard 01 Mar '19

01 Mar '19

Module: wine Branch: master Commit: 057df127387eee0fb127f224465cb21419203dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=057df127387eee0fb127f224… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 1 09:07:45 2019 +0530 kernel32: Fix LOCALE_SSCRIPTS value for Sinhala. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 04fe70f..8a96aa7 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -133,7 +133,7 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "SIN " LOCALE_SPOSITIVESIGN "" - LOCALE_SSCRIPTS "Taml;" + LOCALE_SSCRIPTS "Sinh;" LOCALE_SPARENT "si" LOCALE_SSHORTDATE "yyyy/MMMM/dd" LOCALE_SSHORTESTDAYNAME1 "ස"

1 0

Jump to page:

2025

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-commits March 2019