wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Nikolay Sivov : advapi32: Fix LsaLookupNames2() regarding referenced domain list allocation.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: f8aabe2247e6b899f9360be69a56c919513b6e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8aabe2247e6b899f9360be69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 19 23:39:12 2013 +0400 advapi32: Fix LsaLookupNames2() regarding referenced domain list allocation. --- dlls/advapi32/lsa.c | 58 ++++++++++++-------------------------------------- 1 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 45cc48e..5c3ffc4 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -311,39 +311,6 @@ static BOOL lookup_name( LSA_UNICODE_STRING *name, SID *sid, DWORD *sid_size, WC return ret; } -static INT build_domain(PLSA_REFERENCED_DOMAIN_LIST currentList, PLSA_UNICODE_STRING domain) -{ - ULONG count; - ULONG sid_size = 0,domain_size = 0; - BOOL handled = FALSE; - SID_NAME_USE use; - - for (count = 0; count < currentList->Entries; count ++) - { - if ((currentList->Domains[count].Name.Length == domain->Length) && - (strncmpiW(currentList->Domains[count].Name.Buffer,domain->Buffer,(domain->Length / sizeof(WCHAR))) == 0)) - { - HeapFree(GetProcessHeap(),0,domain->Buffer); - return count; - } - } - - if (currentList->Entries > 0) - currentList->Domains = HeapReAlloc(GetProcessHeap(),0,currentList->Domains, (currentList->Entries + 1) * sizeof(LSA_TRUST_INFORMATION)); - else - currentList->Domains = HeapAlloc(GetProcessHeap(),0,sizeof(LSA_TRUST_INFORMATION)); - - currentList->Domains[currentList->Entries].Name = *domain; - - lookup_name( domain, NULL, &sid_size, NULL, &domain_size, &use, &handled ); - domain_size = 0; - currentList->Domains[currentList->Entries].Sid = HeapAlloc(GetProcessHeap(),0,sid_size); - lookup_name( domain, currentList->Domains[currentList->Entries].Sid, &sid_size, NULL, &domain_size, &use, &handled ); - - currentList->Entries++; - return currentList->Entries-1; -} - /* Adds domain info to referenced domain list. Domain list is stored as plain buffer, layout is: @@ -402,9 +369,10 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, PLSA_UNICODE_STRING names, PLSA_REFERENCED_DOMAIN_LIST *domains, PLSA_TRANSLATED_SID2 *sids ) { - ULONG i, sid_size_total = 0, domain_size_max = 0, size; + ULONG i, sid_size_total = 0, domain_size_max = 0, size, domainname_size_total = 0; ULONG sid_size, domain_size, mapped; BOOL handled = FALSE; + char *domain_data; SID_NAME_USE use; SID *sid; @@ -419,6 +387,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, if (handled) { sid_size_total += sid_size; + domainname_size_total += domain_size; if (domain_size) { if (domain_size > domain_size_max) @@ -430,17 +399,20 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, TRACE("mapped %u out of %u\n", mapped, count); size = sizeof(LSA_TRANSLATED_SID2) * count + sid_size_total; - if (!(*sids = HeapAlloc( GetProcessHeap(), 0, size) )) return STATUS_NO_MEMORY; + if (!(*sids = heap_alloc(size))) return STATUS_NO_MEMORY; sid = (SID *)(*sids + count); - if (!(*domains = HeapAlloc( GetProcessHeap(), 0, sizeof(LSA_REFERENCED_DOMAIN_LIST) ))) + /* use maximum domain count */ + if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count + + sid_size_total + domainname_size_total))) { - HeapFree( GetProcessHeap(), 0, *sids ); + heap_free(*sids); return STATUS_NO_MEMORY; } (*domains)->Entries = 0; - (*domains)->Domains = NULL; + (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST)); + domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count; for (i = 0; i < count; i++) { @@ -448,7 +420,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, domain.Length = domain_size_max*sizeof(WCHAR); domain.MaximumLength = domain_size_max*sizeof(WCHAR); - domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.Length); + domain.Buffer = heap_alloc(domain.Length); (*sids)[i].Use = SidTypeUnknown; (*sids)[i].DomainIndex = -1; @@ -468,13 +440,11 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, if (domain_size) { domain.Length = domain_size * sizeof(WCHAR); - (*sids)[i].DomainIndex = build_domain(*domains, &domain); + (*sids)[i].DomainIndex = lsa_reflist_add_domain(*domains, &domain, &domain_data); } - else - HeapFree(GetProcessHeap(),0,domain.Buffer); } - else - HeapFree(GetProcessHeap(),0,domain.Buffer); + + heap_free(domain.Buffer); } if (mapped == count) return STATUS_SUCCESS;

1 0

Nikolay Sivov : advapi32: Make it possible to free data buffer returned from LsaLookupSids().
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: af641dc94ca0e2cd0afa8aa3ad625e79345bfde4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af641dc94ca0e2cd0afa8aa3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 19 23:26:05 2013 +0400 advapi32: Make it possible to free data buffer returned from LsaLookupSids(). --- dlls/advapi32/advapi32_misc.h | 18 +++++ dlls/advapi32/lsa.c | 169 +++++++++++++++++++++++++++++++++-------- dlls/advapi32/tests/lsa.c | 52 +++++++++++++ 3 files changed, 208 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af641dc94ca0e2cd0afa8…

1 0

André Hentschel : include: Make sure interlocked_cmpxchg128 is defined on ARM64.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: cf195437c66bc81481f395b4d006bcf95b3e346a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf195437c66bc81481f395b4d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 18 18:05:42 2013 +0100 include: Make sure interlocked_cmpxchg128 is defined on ARM64. --- include/wine/port.h | 2 +- libs/port/interlocked.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index bd6f513..d6904c0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -435,7 +435,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); extern int interlocked_xchg_add( int *dest, int incr ); -#ifdef _WIN64 +#if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); #endif diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 576714a..f5e405c 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -343,9 +343,9 @@ int interlocked_xchg_add( int *dest, int incr ) return retv; } -int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) { - int retv; + unsigned char retv; pthread_mutex_lock( &interlocked_mutex ); if (dest[0] == compare[0] && dest[1] == compare[1]) {

1 0

André Hentschel : include: Fix __int64 definition for ARM64.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0066f31ef7c27a45968441c17fe270fb3fa2f4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0066f31ef7c27a45968441c17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 18 17:51:46 2013 +0100 include: Fix __int64 definition for ARM64. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 1bcc0e5..bd6f513 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -55,7 +55,7 @@ */ #if !defined(_MSC_VER) && !defined(__int64) -# if defined(__x86_64__) || defined(_WIN64) +# if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) # define __int64 long # else # define __int64 long long

1 0

Aric Stewart : usp10: GPOS Mark to Base seeks back in the string to the first glyph that is not a mark for its base .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: c1f190a0c5e2f61cb9ed3ba923116c307df9ac55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f190a0c5e2f61cb9ed3ba92… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 10:35:32 2013 -0600 usp10: GPOS Mark to Base seeks back in the string to the first glyph that is not a mark for its base. --- dlls/usp10/opentype.c | 53 ++++++++++++++++++++++++++++-------------- dlls/usp10/shape.c | 7 ++--- dlls/usp10/usp10_internal.h | 3 +- 3 files changed, 39 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1f190a0c5e2f61cb9ed3…

1 0

Aric Stewart : usp10: Group the GDEF table loading with the other opentype tables.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 287243a9b9d4b99236d6953dab4fd08f03ab4b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=287243a9b9d4b99236d6953da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 10:35:24 2013 -0600 usp10: Group the GDEF table loading with the other opentype tables. --- dlls/usp10/opentype.c | 20 +------------------- dlls/usp10/shape.c | 39 +++++++++++++++++++++++++++------------ dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 29 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287243a9b9d4b99236d69…

1 0

Alexandre Julliard : Wine release 1.5.22
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: website Branch: master Commit: 362d469bb84b2b6c5121c63565c0d66f815a9dbe URL: http://source.winehq.org/git/website.git/?a=commit;h=362d469bb84b2b6c5121c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:55:52 2013 +0100 Wine release 1.5.22 --- news/en/2013011801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013011801.xml b/news/en/2013011801.xml new file mode 100644 index 0000000..6d1efdf --- /dev/null +++ b/news/en/2013011801.xml @@ -0,0 +1,16 @@ +<news> +<date>January 18, 2013</date> +<title>Wine 1.5.22 Released</title> +<body> + The Wine development release 1.5.22 is now available. + <a href="{$root}/announce/1.5.22">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine.</li> + <li>Beginnings of the Mac graphics driver.</li> + <li>Support for ARM64 platforms.</li> + <li>Fixes for RTL text in Uniscribe.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.22 : Alexandre Julliard : Release 1.5.22
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: refs/tags/wine-1.5.22 Tag: 322899b46ce3f3b988a1a3a3875a61092784a511 URL: http://source.winehq.org/git/wine.git/?a=tag;h=322899b46ce3f3b988a1a3a3875a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:55 2013 +0100 Release 1.5.22

1 0

Alexandre Julliard : Release 1.5.22.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 9f18a03b14a3405fb04da73cb87f421576825cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f18a03b14a3405fb04da73cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:53 2013 +0100 Release 1.5.22. --- ANNOUNCE | 695 +++++++++++++++++++++++++++++++++++++++++-------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 482 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f18a03b14a3405fb04da…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: a78b2b2e1f0c89ec247eccce410ff45a4a034c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78b2b2e1f0c89ec247eccce4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 18 17:06:38 2013 +0100 po: Update French translation. --- po/fr.po | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/po/fr.po b/po/fr.po index 91cab2c..4b18035 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8316,17 +8316,13 @@ msgid "Don't install" msgstr "Ne pas installer" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Lorsqu'il est installé, ActiveX a un accès complet à votre ordinateur. Ne " -"cliquez pas sur le bouton d'installation à moins d'avoir une confiance " -"absolue dans la source ci-dessus." +"Lorsqu'il est installé, un composant ActiveX a un accès complet à votre " +"ordinateur. Ne cliquez pas sur le bouton d'installation à moins d'avoir une " +"confiance absolue dans la source ci-dessus." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10316,10 +10312,8 @@ msgid "Connection-specific DNS suffix" msgstr "Suffixe DNS propre à la connexion" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "Adresse IP" +msgstr "Adresse IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10362,10 +10356,8 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "Adresse IP" +msgstr "Adresse IPv6" #: net.rc:27 msgid "" @@ -10518,50 +10510,40 @@ msgid "State" msgstr "État" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfaces" +msgstr "Statistiques de l'interface" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Envoyés" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Reçus" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "octets" +msgstr "Octets" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Paquets monodiffusion" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Paquets non monodiffusion" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Avis de non-responsabilité" +msgstr "Rejets" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Erreur" +msgstr "Erreurs" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Port inconnu.\n" +msgstr "Protocoles inconnus" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
74
Older →

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 January 2013