wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : ntdll: Try to match the language name when looking for a manifest file.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 2febc9d41a9258447ac55976c327d4851bbd2ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=2febc9d41a9258447ac55976c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:54:03 2011 +0200 ntdll: Try to match the language name when looking for a manifest file. --- dlls/ntdll/actctx.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 80f69a8..cba0988 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -182,6 +182,7 @@ struct actctx_loader unsigned int allocated_dependencies; }; +static const WCHAR wildcardW[] = {'*',0}; static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; static const WCHAR bindingRedirectW[] = {'b','i','n','d','i','n','g','R','e','d','i','r','e','c','t',0}; @@ -208,6 +209,7 @@ static const WCHAR iidW[] = {'i','i','d',0}; static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; static const WCHAR manifestVersionW[] = {'m','a','n','i','f','e','s','t','V','e','r','s','i','o','n',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; +static const WCHAR neutralW[] = {'n','e','u','t','r','a','l',0}; static const WCHAR newVersionW[] = {'n','e','w','V','e','r','s','i','o','n',0}; static const WCHAR oldVersionW[] = {'o','l','d','V','e','r','s','i','o','n',0}; static const WCHAR optionalW[] = {'o','p','t','i','o','n','a','l',0}; @@ -423,7 +425,6 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) { - static const WCHAR wildcardW[] = {'*',0}; if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) return FALSE; } @@ -1799,12 +1800,12 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) { static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', - '*', /* FIXME */ - '.','m','a','n','i','f','e','s','t',0}; + '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; IO_STATUS_BLOCK io; + const WCHAR *lang = ai->language; unsigned int data_pos = 0, data_len; char buffer[8192]; @@ -1814,7 +1815,9 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) + sizeof(lookup_fmtW) ))) return NULL; - sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, ai->version.major, ai->version.minor); + if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, + ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer),

1 0

Alexandre Julliard : setupapi: Use the specified language for SxS manifest file names.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 8306dd55f1713f0d0081daaa9f6c3f96c22ae064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8306dd55f1713f0d0081daaa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:53:00 2011 +0200 setupapi: Use the specified language for SxS manifest file names. --- dlls/setupapi/fakedll.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e21507b..645b7e8 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -595,9 +595,9 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, } static void get_manifest_filename( const xmlstr_t *arch, const xmlstr_t *name, const xmlstr_t *key, - const xmlstr_t *version, WCHAR *buffer, DWORD size ) + const xmlstr_t *version, const xmlstr_t *lang, WCHAR *buffer, DWORD size ) { - static const WCHAR trailerW[] = {'_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + static const WCHAR trailerW[] = {'_','d','e','a','d','b','e','e','f',0}; DWORD pos; pos = MultiByteToWideChar( CP_UTF8, 0, arch->ptr, arch->len, buffer, size ); @@ -607,12 +607,14 @@ static void get_manifest_filename( const xmlstr_t *arch, const xmlstr_t *name, c pos += MultiByteToWideChar( CP_UTF8, 0, key->ptr, key->len, buffer + pos, size - pos ); buffer[pos++] = '_'; pos += MultiByteToWideChar( CP_UTF8, 0, version->ptr, version->len, buffer + pos, size - pos ); + buffer[pos++] = '_'; + pos += MultiByteToWideChar( CP_UTF8, 0, lang->ptr, lang->len, buffer + pos, size - pos ); memcpy( buffer + pos, trailerW, sizeof(trailerW) ); strlwrW( buffer ); } static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, const xmlstr_t *name, - const xmlstr_t *key, const xmlstr_t *version, + const xmlstr_t *key, const xmlstr_t *version, const xmlstr_t *lang, const void *dll_data, size_t dll_size ) { static const WCHAR winsxsW[] = {'w','i','n','s','x','s','\\'}; @@ -633,7 +635,7 @@ static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, cons path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); pos += sizeof(winsxsW) / sizeof(WCHAR); - get_manifest_filename( arch, name, key, version, path + pos, path_len - pos ); + get_manifest_filename( arch, name, key, version, lang, path + pos, path_len - pos ); pos += strlenW( path + pos ); path[pos++] = '\\'; strcpyW( path + pos, filename ); @@ -651,7 +653,7 @@ static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, cons } static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const xmlstr_t *key, - const xmlstr_t *version, const void *data, DWORD len ) + const xmlstr_t *version, const xmlstr_t *lang, const void *data, DWORD len ) { static const WCHAR winsxsW[] = {'w','i','n','s','x','s','\\','m','a','n','i','f','e','s','t','s','\\'}; static const WCHAR extensionW[] = {'.','m','a','n','i','f','e','s','t',0}; @@ -668,7 +670,7 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); pos += sizeof(winsxsW) / sizeof(WCHAR); - get_manifest_filename( arch, name, key, version, path + pos, MAX_PATH - pos ); + get_manifest_filename( arch, name, key, version, lang, path + pos, MAX_PATH - pos ); strcatW( path + pos, extensionW ); handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND) @@ -701,13 +703,13 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR #endif xmlbuf_t buffer; xmlstr_t elem, attr_name, attr_value; - xmlstr_t name, version, arch, key; + xmlstr_t name, version, arch, key, lang; BOOL end = FALSE, error; buffer.ptr = manifest; buffer.end = manifest + len; - name.ptr = version.ptr = arch.ptr = key.ptr = NULL; - name.len = version.len = arch.len = key.len = 0; + name.ptr = version.ptr = arch.ptr = key.ptr = lang.ptr = NULL; + name.len = version.len = arch.len = key.len = lang.len = 0; while (next_xml_elem( &buffer, &elem )) { @@ -718,9 +720,15 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR else if (xmlstr_cmp(&attr_name, "version")) version = attr_value; else if (xmlstr_cmp(&attr_name, "processorArchitecture")) arch = attr_value; else if (xmlstr_cmp(&attr_name, "publicKeyToken")) key = attr_value; + else if (xmlstr_cmp(&attr_name, "language")) lang = attr_value; } if (!error && name.ptr && version.ptr && arch.ptr && key.ptr) { + if (!lang.ptr) + { + lang.ptr = "none"; + lang.len = strlen( lang.ptr ); + } if (!arch.len) /* fixup the architecture */ { char *new_buffer = HeapAlloc( GetProcessHeap(), 0, len + sizeof(current_arch) ); @@ -729,14 +737,14 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR memcpy( new_buffer + strlen(new_buffer), arch.ptr, len - (arch.ptr - manifest) ); arch.ptr = current_arch; arch.len = strlen( current_arch ); - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, dll_data, dll_size )) - create_manifest( &arch, &name, &key, &version, new_buffer, len + arch.len ); + if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + create_manifest( &arch, &name, &key, &version, &lang, new_buffer, len + arch.len ); HeapFree( GetProcessHeap(), 0, new_buffer ); } else { - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, dll_data, dll_size )) - create_manifest( &arch, &name, &key, &version, manifest, len ); + if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + create_manifest( &arch, &name, &key, &version, &lang, manifest, len ); } } }

1 0

André Hentschel : Wine 1.3.27 freigegeben
by Jeremy Newman 29 Aug '11

29 Aug '11

Module: website Branch: master Commit: 7ac3379fbf443d6cff20b99d0bc349ef8d76f7a2 URL: http://source.winehq.org/git/website.git/?a=commit;h=7ac3379fbf443d6cff20b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 27 13:51:10 2011 +0200 Wine 1.3.27 freigegeben --- news/de/2011082601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011082601.xml b/news/de/2011082601.xml new file mode 100644 index 0000000..79789bf --- /dev/null +++ b/news/de/2011082601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. August 2011</date> +<title>Wine 1.3.27 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.27 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.27">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Multisampling in Direct3D.</li> + <li>Neue Version der Gecko Engine.</li> + <li>Verbesserungen am Netzwerk Proxy Handling.</li> + <li>Besserere Unterstützung für das Schreiben mit MSXML.</li> + <li>Side-by-side Manifeste für die eingebauten Bibliotheken.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.27
by Jeremy Newman 29 Aug '11

29 Aug '11

Module: website Branch: master Commit: abf4bdda302b7614c84ac1e3c965e27db016a4d1 URL: http://source.winehq.org/git/website.git/?a=commit;h=abf4bdda302b7614c84ac1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 20:59:38 2011 +0200 French translation for release 1.3.27 --- news/fr/2011082601.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011082601.xml b/news/fr/2011082601.xml new file mode 100644 index 0000000..9eee3b2 --- /dev/null +++ b/news/fr/2011082601.xml @@ -0,0 +1,20 @@ +<news> +<date>26 août 2011</date> +<title>Sortie de Wine 1.3.27</title> +<body> + La version de développement 1.3.27 de Wine est disponible. + <a href="{$root}/announce/1.3.27">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du multisampling dans Direct3D.</li> + <li>Nouvelle version du moteur Gecko.</li> + <li>Amélioration de la gestion des proxys réseau.</li> + <li>Meilleure prise en charge de l'écriture dans MSXML.</li> + <li>Fichiers manifestes côte à côte pour les bibliothèques intégrées</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.27
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: website Branch: master Commit: 591542f9b2cdc16a9e0014c9754152686901e17f URL: http://source.winehq.org/git/website.git/?a=commit;h=591542f9b2cdc16a9e0014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:18:10 2011 +0200 Wine release 1.3.27 --- news/en/2011082601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011082601.xml b/news/en/2011082601.xml new file mode 100644 index 0000000..e5355cd --- /dev/null +++ b/news/en/2011082601.xml @@ -0,0 +1,17 @@ +<news> +<date>August 26, 2011</date> +<title>Wine 1.3.27 Released</title> +<body> + The Wine development release 1.3.27 is now available. + <a href="{$root}/announce/1.3.27">What's new</a> in this release: +<ul> + <li>Support for multisampling in Direct3D.</li> + <li>New version of the Gecko engine.</li> + <li>Improvements to the network proxy handling.</li> + <li>Better write support in MSXML.</li> + <li>Side-by-side manifests for built-in libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.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.3.27 : Alexandre Julliard : Release 1.3.27
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: refs/tags/wine-1.3.27 Tag: 80cd640606813f7cc9aa86ad5ad1bb33a5f95a6a URL: http://source.winehq.org/git/wine.git/?a=tag;h=80cd640606813f7cc9aa86ad5ad1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:07:22 2011 +0200 Release 1.3.27

1 0

Alexandre Julliard : Release 1.3.27.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 6a6aab27633405aeb5e464943110960f0099dffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6aab27633405aeb5e464943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:07:20 2011 +0200 Release 1.3.27. --- ANNOUNCE | 1141 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 512 insertions(+), 649 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a6aab27633405aeb5e46…

1 0

Francois Gouget : psapi/tests: Fix the EnumProcessModules() test and provide more diagnostic information if it fails.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 187de1794eb73a4a0918414fed11b7ca451f095f URL: http://source.winehq.org/git/wine.git/?a=commit;h=187de1794eb73a4a0918414fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 16:09:03 2011 +0200 psapi/tests: Fix the EnumProcessModules() test and provide more diagnostic information if it fails. On some Windows systems aclayers.dll gets injected into the process and brings in a lot of extra dlls. --- dlls/psapi/tests/psapi_main.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4c129b..8a1cfc1 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -107,10 +107,26 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 * sizeof(HMODULE), - "cbNeeded=%d\n", cbNeeded); ok(hMod == GetModuleHandle(NULL), "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); + /* Windows sometimes has a bunch of extra dlls, presumably brought in by + * aclayers.dll. + */ + if (cbNeeded < 4 * sizeof(HMODULE) || cbNeeded > 30 * sizeof(HMODULE)) + { + HMODULE hmods[100]; + int i; + ok(0, "cbNeeded=%d\n", cbNeeded); + + pEnumProcessModules(hpQV, hmods, sizeof(hmods), &cbNeeded); + for (i = 0 ; i < cbNeeded/sizeof(*hmods); i++) + { + char path[1024]; + GetModuleFileNameA(hmods[i], path, sizeof(path)); + trace("i=%d hmod=%p path=[%s]\n", i, hmods[i], path); + } + } } static void test_GetModuleInformation(void)

1 0

Francois Gouget : avifil32: The stream format string cannot really be translated so remove it from the resources .
by Alexandre Julliard 26 Aug '11

26 Aug '11

1 0

Francois Gouget : winefile: The title format string cannot really be translated so remove it from the resources .
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 580ece97a039b71bf9c6440e4af9d1988ffab304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580ece97a039b71bf9c6440e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 15:32:46 2011 +0200 winefile: The title format string cannot really be translated so remove it from the resources. --- po/ar.po | 26 +++++++++++--------------- po/bg.po | 26 +++++++++++--------------- po/ca.po | 26 +++++++++++--------------- po/cs.po | 26 +++++++++++--------------- po/da.po | 26 +++++++++++--------------- po/de.po | 26 +++++++++++--------------- po/el.po | 26 +++++++++++--------------- po/en.po | 26 +++++++++++--------------- po/en_US.po | 26 +++++++++++--------------- po/eo.po | 26 +++++++++++--------------- po/es.po | 26 +++++++++++--------------- po/fa.po | 26 +++++++++++--------------- po/fi.po | 26 +++++++++++--------------- po/fr.po | 26 +++++++++++--------------- po/he.po | 26 +++++++++++--------------- po/hi.po | 26 +++++++++++--------------- po/hu.po | 26 +++++++++++--------------- po/it.po | 26 +++++++++++--------------- po/ja.po | 26 +++++++++++--------------- po/ko.po | 26 +++++++++++--------------- po/lt.po | 26 +++++++++++--------------- po/ml.po | 26 +++++++++++--------------- po/nb_NO.po | 26 +++++++++++--------------- po/nl.po | 26 +++++++++++--------------- po/or.po | 26 +++++++++++--------------- po/pa.po | 26 +++++++++++--------------- po/pl.po | 26 +++++++++++--------------- po/pt_BR.po | 26 +++++++++++--------------- po/pt_PT.po | 26 +++++++++++--------------- po/rm.po | 26 +++++++++++--------------- po/ro.po | 26 +++++++++++--------------- po/ru.po | 26 +++++++++++--------------- po/sk.po | 26 +++++++++++--------------- po/sl.po | 26 +++++++++++--------------- po/sr_RS(a)cyrillic.po | 26 +++++++++++--------------- po/sr_RS(a)latin.po | 26 +++++++++++--------------- po/sv.po | 26 +++++++++++--------------- po/te.po | 26 +++++++++++--------------- po/th.po | 26 +++++++++++--------------- po/tr.po | 26 +++++++++++--------------- po/uk.po | 26 +++++++++++--------------- po/wa.po | 26 +++++++++++--------------- po/wine.pot | 26 +++++++++++--------------- po/zh_CN.po | 26 +++++++++++--------------- po/zh_TW.po | 26 +++++++++++--------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.c | 4 ++-- programs/winefile/winefile.rc | 1 - 48 files changed, 497 insertions(+), 679 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=580ece97a039b71bf9c64…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
77
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 August 2011