August 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : Release 1.8.4.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: c03303838dc648b4dc9fc8d0c78b4ec51a455253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03303838dc648b4dc9fc8d0c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 17 21:51:28 2016 +0200 Release 1.8.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 358 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 6 ++ VERSION | 2 +- configure | 18 ++-- 4 files changed, 188 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c03303838dc648b4dc9fc…

1 0

Nikolay Sivov : dwrite: Sanitize specified stretch value, valid range is [ 1, 9].
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 1a5fa5f1ac0beba5b4311ce3252b44d413644bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5fa5f1ac0beba5b4311ce32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 22:21:13 2016 +0300 dwrite: Sanitize specified stretch value, valid range is [1, 9]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff57b1febba846fe30f420519b4aec2a1f23dc35) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/opentype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4799088..9e3e156 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1083,9 +1083,10 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC USHORT version = GET_BE_WORD(tt_os2->version); USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); + USHORT usWidthClass = GET_BE_WORD(tt_os2->usWidthClass); - if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - props->stretch = GET_BE_WORD(tt_os2->usWidthClass); + if (usWidthClass > DWRITE_FONT_STRETCH_UNDEFINED && usWidthClass <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + props->stretch = usWidthClass; if (usWeightClass >= 1 && usWeightClass <= 9) usWeightClass *= 100;

1 0

Nikolay Sivov : t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 89c06a84f5aca784afe969f7592e46dca83c34b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c06a84f5aca784afe969f75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:19 2016 +0300 t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d01ab5ee4b56c8284d0bd9ae9af9f257e041b54e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9fae0a8..396f665 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -166,7 +166,7 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) return E_NOFREEMEMORY; GetOutlineTextMetricsA(hDC, len, otm); - ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + ret = TTIsEmbeddingEnabledForFacename((LPCSTR)otm + (ULONG_PTR)otm->otmpFaceName, enabled); HeapFree(GetProcessHeap(), 0, otm); return ret; }

1 0

Tag wine-1.8.4 : Alexandre Julliard : Release 1.8.4
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: refs/tags/wine-1.8.4 Tag: 21c68d502be50b057a1862b5212da2c7886f146d URL: http://source.winehq.org/git/wine.git/?a=tag;h=21c68d502be50b057a1862b5212d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 22 21:30:24 2016 +0900 Release 1.8.4

1 0

Sebastian Lackner : dwrite: Fix font stretch name conversion table.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 4ff44c51845ed4587e78fd594d9e44841f5ef9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff44c51845ed4587e78fd594… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 13 22:21:14 2016 +0300 dwrite: Fix font stretch name conversion table. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1540a19359ff14a8380578c1ce7f81f16a859dd3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 68b2c17..e7382c0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2760,6 +2760,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static const WCHAR ultraexpandedW[] = {'U','l','t','r','a',' ','E','x','p','a','n','d','e','d',0}; static const WCHAR *stretchnamesW[] = { + NULL, /* DWRITE_FONT_STRETCH_UNDEFINED */ ultracondensedW, extracondensedW, condensedW,

1 0

Michael Cronenworth : secur32: Provide a static declaration for gnutls_cipher_get_block_size.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: fad28964903e708e3236ebe72c11a6024d349db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad28964903e708e3236ebe72… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jun 16 00:21:13 2016 -0500 secur32: Provide a static declaration for gnutls_cipher_get_block_size. Instead of providing an extern provide a static declaration. The function return type changed from signed to unsigned in GnuTLS 3.5. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf5ac531a030bce9e798ab66bc53e84a65ca8fdb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 95c9bda..4f95e4d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ -extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); +static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); -MAKE_FUNCPTR(gnutls_cipher_get_block_size); MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit);

1 0

Michael Stefaniuc : tools: Get the bug list for ANNOUNCE from the stable-notes git notes.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: e83b4681b7c4a3894d29bb32bce7528b14c9f018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83b4681b7c4a3894d29bb32b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 29 01:32:21 2016 +0200 tools: Get the bug list for ANNOUNCE from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index fedbc37..9ebeb10 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; binmode STDOUT, ':utf8'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . "..stable" or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Justas Lavišius : include: Force stack alignment on x86_64.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 13940871b7c820ad19a405194f1d91d4cdae2cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=13940871b7c820ad19a405194… Author: Justas Lavišius <bucaneer(a)gmail.com> Date: Wed Jan 27 17:35:29 2016 +0200 include: Force stack alignment on x86_64. Signed-off-by: Justas Lavišius <bucaneer(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dccb57dfd9c668eff5e672def93405be8a3303bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/windef.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index e914726..1e54fcb 100644 --- a/include/windef.h +++ b/include/windef.h @@ -64,7 +64,11 @@ extern "C" { # error You need to define __stdcall for your compiler # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((ms_abi)) +# endif # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -78,7 +82,11 @@ extern "C" { # define __cdecl __attribute__((__cdecl__)) # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __cdecl __attribute__((ms_abi)) +# endif # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Piotr Caban : msvcrt: Return error when previously parsed type is accessed while demangling simple data type.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 31b09cda4a4ca7b960ff8157c289ce13754824f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b09cda4a4ca7b960ff8157c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2016 +0200 msvcrt: Return error when previously parsed type is accessed while demangling simple data type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42c2799589ae7f805e5f67a2b04f24e4aa3e0b34) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index beaec4f..ec2c2dd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -904,6 +904,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done;

1 0

André Hentschel : ndis.sys: Implement NdisSystemProcessorCount.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: abffa4ed2f8296398255608373d5e1889665cd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abffa4ed2f829639825560837… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:28 2016 +0100 ndis.sys: Implement NdisSystemProcessorCount. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 113f43250a2de4e4ff73226cb0006a7833d2fb7a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ndis.sys/main.c | 10 ++++++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 499f167..6e1bb9b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -48,3 +48,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) { FIXME("(%p): stub\n", lock); } + +CCHAR WINAPI NdisSystemProcessorCount(void) +{ + SYSTEM_INFO si; + + TRACE("()\n"); + GetSystemInfo(&si); + + return si.dwNumberOfProcessors; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 31b421a..8957d8f 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -257,7 +257,7 @@ @ stub NdisSetTimer @ stub NdisSetTimerEx @ stub NdisSetupDmaTransfer -@ stub NdisSystemProcessorCount +@ stdcall NdisSystemProcessorCount() @ stub NdisTerminateWrapper @ stub NdisTransferData @ stub NdisUnchainBufferAtBack diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index aa77d9a..ffa1396 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -33,5 +33,6 @@ typedef struct _NDIS_SPIN_LOCK NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0