February 2009 - Wine-commits

Juan Lang : snmpapi: Relax tests to fix some failures.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: dd75176d3459adf54cdb62920e72d8bd8070d074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd75176d3459adf54cdb62920… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 13 09:38:29 2009 -0800 snmpapi: Relax tests to fix some failures. The tests were overly restrictive. The functions are supposed to return values less than 0, 0, or greater than 0, whereas the tests restricted the return values to -1, 0, or 1. Using less than 0/greater than 0 comparisons rather than == -1 or == 1 should fix a few failing tests, and match the API descriptions better. --- dlls/snmpapi/tests/util.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index f8067c2..7ef36fb 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -330,7 +330,7 @@ static void test_SnmpUtilOctetsCmp(void) ok(ret == 1, "SnmpUtilOctetsCmp failed\n"); ret = pSnmpUtilOctetsCmp(&octets1, &octets2); - ok(ret == -1, "SnmpUtilOctetsCmp failed\n"); + ok(ret < 0, "SnmpUtilOctetsCmp failed\n"); } static void test_SnmpUtilOidNCmp(void) @@ -370,19 +370,19 @@ static void test_SnmpUtilOidNCmp(void) ok(!ret, "SnmpUtilOidNCmp failed\n"); ret = SnmpUtilOidNCmp(&oid1, &oid2, 4); - ok(ret == -1, "SnmpUtilOidNCmp failed: %d\n", ret); + ok(ret < 0, "SnmpUtilOidNCmp failed: %d\n", ret); ret = SnmpUtilOidNCmp(&oid2, &oid1, 4); - ok(ret == 1, "SnmpUtilOidNCmp failed: %d\n", ret); + ok(ret > 0, "SnmpUtilOidNCmp failed: %d\n", ret); oid1.idLength = 3; memcpy(oid1.ids, oid2.ids, sizeof(UINT) * 4); ret = SnmpUtilOidNCmp(&oid1, &oid1, 4); ok(!ret, "SnmpUtilOidNCmp failed: %d\n", ret); ret = SnmpUtilOidNCmp(&oid2, &oid1, 4); - ok(ret == 1, "SnmpUtilOidNCmp failed: %d\n", ret); + ok(ret > 0, "SnmpUtilOidNCmp failed: %d\n", ret); ret = SnmpUtilOidNCmp(&oid1, &oid2, 4); - ok(ret == -1, "SnmpUtilOidNCmp failed: %d\n", ret); + ok(ret < 0, "SnmpUtilOidNCmp failed: %d\n", ret); ret = SnmpUtilOidNCmp(&oid1, &oid2, 2); ok(!ret, "SnmpUtilOidNCmp failed: %d\n", ret); @@ -410,10 +410,10 @@ static void test_SnmpUtilOidCmp(void) } ret = SnmpUtilOidCmp(&oid2, &oid1); - ok(ret == 1, "SnmpUtilOidCmp failed\n"); + ok(ret > 0, "SnmpUtilOidCmp failed\n"); ret = SnmpUtilOidCmp(&oid1, &oid2); - ok(ret == -1, "SnmpUtilOidCmp failed\n"); + ok(ret < 0, "SnmpUtilOidCmp failed\n"); } static void test_SnmpUtilOidAppend(void)

1 0

Juan Lang : wintrust: Fix a few failing tests.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: ae2c086e6c54871502c7589ca070df9fdbfae4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2c086e6c54871502c7589ca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 13 09:45:26 2009 -0800 wintrust: Fix a few failing tests. --- dlls/wintrust/tests/softpub.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5c5d892..3e4347d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -303,12 +303,20 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == - TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n", + TRUST_E_NOSIGNATURE || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); - ok(!memcmp(&provDataSIP.gSubject, &unknown, sizeof(unknown)), - "Unexpected subject GUID\n"); - ok(provDataSIP.pSip != NULL, "Expected a SIP\n"); - ok(provDataSIP.psSipSubjectInfo != NULL, "Expected a subject info\n"); + if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE) + { + ok(!memcmp(&provDataSIP.gSubject, &unknown, sizeof(unknown)), + "Unexpected subject GUID\n"); + ok(provDataSIP.pSip != NULL, "Expected a SIP\n"); + ok(provDataSIP.psSipSubjectInfo != NULL, + "Expected a subject info\n"); + } funcs->pfnFree(data.padwTrustStepErrors); } } @@ -444,10 +452,11 @@ static void test_wintrust(void) getNotepadPath(notepadPathW, MAX_PATH); file.pcwszFilePath = notepadPathW; r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(r == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", r); + ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(hr == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", - hr); + ok(hr == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); } static BOOL (WINAPI * pWTHelperGetKnownUsages)(DWORD action, PCCRYPT_OID_INFO **usages);

1 0

Alexandre Julliard : ntdll: Avoid null dereference in the NtCreateSymbolicLinkObject trace.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: d62d6ac9c6ac9afd01f4a045c736b9dbf95940ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62d6ac9c6ac9afd01f4a045c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:41:09 2009 +0100 ntdll: Avoid null dereference in the NtCreateSymbolicLinkObject trace. --- dlls/ntdll/om.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 64e48a3..fb6d675 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -540,13 +540,14 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACC IN PUNICODE_STRING TargetName) { NTSTATUS ret; - TRACE("(%p,0x%08x,%p, -> %s)\n", SymbolicLinkHandle, DesiredAccess, ObjectAttributes, - debugstr_us(TargetName)); - dump_ObjectAttributes(ObjectAttributes); if (!SymbolicLinkHandle || !TargetName) return STATUS_ACCESS_VIOLATION; if (!TargetName->Buffer) return STATUS_INVALID_PARAMETER; + TRACE("(%p,0x%08x,%p, -> %s)\n", SymbolicLinkHandle, DesiredAccess, ObjectAttributes, + debugstr_us(TargetName)); + dump_ObjectAttributes(ObjectAttributes); + SERVER_START_REQ(create_symlink) { req->access = DesiredAccess;

1 0

Alexandre Julliard : ntdll: Improve debugging helper for object attributes structure.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 912d98c2ae57708c2253a9b46e6659abf87d9728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=912d98c2ae57708c2253a9b46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:46:44 2009 +0100 ntdll: Improve debugging helper for object attributes structure. --- dlls/ntdll/misc.c | 10 +++++----- dlls/ntdll/nt.c | 7 +++---- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/om.c | 14 +++++--------- dlls/ntdll/reg.c | 7 +++---- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 5272c87..f72ea50 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -37,12 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define POP_FPU(x) DO_FPU("fstpl",x) #endif -void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *oa) +LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { - if (oa) - TRACE("%p:(name=%s, attr=0x%08x, hRoot=%p, sd=%p)\n", - oa, debugstr_us(oa->ObjectName), - oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor); + if (!oa) return "<null>"; + return wine_dbg_sprintf( "{name=%s, attr=0x%08x, hRoot=%p, sd=%p}\n", + debugstr_us(oa->ObjectName), oa->Attributes, + oa->RootDirectory, oa->SecurityDescriptor ); } LPCSTR debugstr_us( const UNICODE_STRING *us ) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7d24731..7654f69 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -63,10 +63,9 @@ NTSTATUS WINAPI NtDuplicateToken( { NTSTATUS status; - TRACE("(%p,0x%08x,%p,0x%08x,0x%08x,%p)\n", - ExistingToken, DesiredAccess, ObjectAttributes, - ImpersonationLevel, TokenType, NewToken); - dump_ObjectAttributes(ObjectAttributes); + TRACE("(%p,0x%08x,%s,0x%08x,0x%08x,%p)\n", + ExistingToken, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes), + ImpersonationLevel, TokenType, NewToken); if (ObjectAttributes && ObjectAttributes->SecurityQualityOfService) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1d56da8..444a211 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -43,9 +43,9 @@ extern void wait_suspend( CONTEXT *context ); extern void WINAPI __regs_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); extern void set_cpu_context( const CONTEXT *context ); -/* debug helper */ +/* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); -extern void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *ObjectAttributes); +extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa); extern NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ); extern NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index fb6d675..588d810 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -332,8 +332,7 @@ NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Desir POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x)\n", DirectoryHandle, DesiredAccess); - dump_ObjectAttributes(ObjectAttributes); + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; if (!ObjectAttributes) return STATUS_INVALID_PARAMETER; @@ -381,8 +380,7 @@ NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Des POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x)\n", DirectoryHandle, DesiredAccess); - dump_ObjectAttributes(ObjectAttributes); + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; @@ -489,8 +487,7 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject(OUT PHANDLE LinkHandle, IN ACCESS_MASK IN POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%p)\n",LinkHandle, DesiredAccess, ObjectAttributes); - dump_ObjectAttributes(ObjectAttributes); + TRACE("(%p,0x%08x,%s)\n",LinkHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!LinkHandle) return STATUS_ACCESS_VIOLATION; if (!ObjectAttributes) return STATUS_INVALID_PARAMETER; @@ -544,9 +541,8 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACC if (!SymbolicLinkHandle || !TargetName) return STATUS_ACCESS_VIOLATION; if (!TargetName->Buffer) return STATUS_INVALID_PARAMETER; - TRACE("(%p,0x%08x,%p, -> %s)\n", SymbolicLinkHandle, DesiredAccess, ObjectAttributes, - debugstr_us(TargetName)); - dump_ObjectAttributes(ObjectAttributes); + TRACE("(%p,0x%08x,%s -> %s)\n", SymbolicLinkHandle, DesiredAccess, + debugstr_ObjectAttributes(ObjectAttributes), debugstr_us(TargetName)); SERVER_START_REQ(create_symlink) { diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 0d6a137..6521c70 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -693,10 +693,9 @@ NTSTATUS WINAPI NtReplaceKey( IN HANDLE Key, IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) { - FIXME("(%p),stub!\n", Key); - dump_ObjectAttributes(ObjectAttributes); - dump_ObjectAttributes(ReplacedObjectAttributes); - return STATUS_SUCCESS; + FIXME("(%s,%p,%s),stub!\n", debugstr_ObjectAttributes(ObjectAttributes), Key, + debugstr_ObjectAttributes(ReplacedObjectAttributes) ); + return STATUS_SUCCESS; } /****************************************************************************** * NtRestoreKey [NTDLL.@]

1 0

Maurilio Genovese : patch for debian repository information
by Jeremy Newman 16 Feb '09

16 Feb '09

Module: website Branch: master Commit: 291c0647a26fb28316823b0edda4572ad92ca6fe URL: http://source.winehq.org/git/website.git/?a=commit;h=291c0647a26fb28316823b… Author: Maurilio Genovese <repository(a)lamaresh.net> Date: Sun Feb 15 09:25:49 2009 +0100 patch for debian repository information in attachment Maurilio Genovese >From 34df50d564984066444abe29b363d5aa5ef85bcd Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <repository(a)lamaresh.net> Date: Sun, 15 Feb 2009 09:23:25 +0100 Subject: Added Sid and Etch repository information modified: templates/en/download.template modified: templates/en/download/deblenny.template --- templates/en/download.template | 4 ++-- templates/en/download/deblenny.template | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 27d1c76..43d9479 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -70,8 +70,8 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deblenny">Debian</a></b> - binary .debs for Debian Lenny (5.0)</td> - <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a></td> + binary .debs for Debian Etch, Lenny and Sid</td> + <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br><a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download/deblenny.template b/templates/en/download/deblenny.template index d5e9238..6a18dea 100644 --- a/templates/en/download/deblenny.template +++ b/templates/en/download/deblenny.template @@ -2,7 +2,7 @@  <h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine for Debian Lenny +Wine for Debian Etch, Lenny and Sid <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> <p>Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download.</p> @@ -22,8 +22,9 @@ Wine for Debian Lenny <div style="position:relative;left:20px">Open a terminal</div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> <div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#to open repository file with a text editor (you can use gedit or another)</font></div> -<div style="position:relative;left:20px">Add this line: <i>deb http://www.lamaresh.net/apt lenny main</i></div> -<div style="position:relative;left:20px">Add this line if you want also sources repository: <i>deb-src http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Add this line for Etch: <i>deb http://www.lamaresh.net/apt etch main</i></div> +<div style="position:relative;left:20px">Add this line for Lenny: <i>deb http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Add this line for Sid: <i>deb http://www.lamaresh.net/apt sid main</i></div> <div style="position:relative;left:20px">Save and close sources.list</div> <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> @@ -34,6 +35,10 @@ Wine for Debian Lenny <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> <div style="position:relative;left:20px"><i>dpkg -i wine_1.1.xxx.deb</i> <font color="gray">#change xxx with your chosen package, this will install wine</font></div> -<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Maintainer: <a href="http://www.lamaresh.net" target="_blank">homepage</a>, <a href="mailto:repository(a)lamaresh.net">email</a></p> +<br><br><p style="font-size:12px;text-align:left;font-style: italic;"> +Homepage: <a href="http://www.lamaresh.net" target="_blank">http://www.lamaresh.net/</a><br> +Repository maintainer: <a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br> +Package builder: <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a> +</p>

1 0

Alexandre Julliard : Wine release 1.1.15
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: website Branch: master Commit: bbd948a7be2ea6fb7fb51129e0d27632099715f6 URL: http://source.winehq.org/git/website.git/?a=commit;h=bbd948a7be2ea6fb7fb511… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 18:08:06 2009 +0100 Wine release 1.1.15 --- news/en/2009021301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009021301.xml b/news/en/2009021301.xml new file mode 100644 index 0000000..1dc2866 --- /dev/null +++ b/news/en/2009021301.xml @@ -0,0 +1,17 @@ +<news> +<date>February 13, 2009</date> +<title>Wine 1.1.15 Released</title> +<body> +<p> The Wine development release 1.1.15 is now available.</p> +<p> <a href="{$root}/announce/1.1.15">What's new</a> in this release: +<ul> + <li>Gecko engine update.</li> + <li>Better region support in GdiPlus.</li> + <li>Support for cross-compilation in winegcc.</li> + <li>Beginnings of MS Text Framework support.</li> + <li>Many fixes to the regression tests on Windows.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.15.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>. +</p></body></news>

1 0

Alexandre Julliard : Release 1.1.15.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 6a1537c4b5037be5253c33021fda3a02430533f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1537c4b5037be5253c33021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 18:01:33 2009 +0100 Release 1.1.15. --- ANNOUNCE | 1380 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 600 insertions(+), 800 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a1537c4b5037be5253c3…

1 0

Tag wine-1.1.15 : Alexandre Julliard : Release 1.1.15
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: refs/tags/wine-1.1.15 Tag: 477e8d9ae057fc2aa7d03625475a20638105300a URL: http://source.winehq.org/git/wine.git/?a=tag;h=477e8d9ae057fc2aa7d03625475a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 13 18:01:33 2009 +0100 Release 1.1.15

1 0

Christoph Korn : German template sync.
by Jeremy Newman 13 Feb '09

13 Feb '09

Module: website Branch: master Commit: 5dab9bb57718762f46abe0ace6a6447010bff887 URL: http://source.winehq.org/git/website.git/?a=commit;h=5dab9bb57718762f46abe0… Author: Christoph Korn <c_korn(a)gmx.de> Date: Fri Feb 13 01:20:00 2009 +0100 German template sync. >From 32b1a38732b7f785aaaff36f87929172dbecc23d Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Fri, 13 Feb 2009 00:57:50 +0100 Subject: German template sync: Note right click->save as for key on Ubuntu download page --- templates/de/download/deb.template | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 5b0bbcd..7ed2f4a 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -43,10 +43,11 @@ Version du benutzt.</p> zu der Liste der vertrauenswürdigen Schlüssel deines Systems hinzufügen.</p> <p><b><a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Lade -und speichere Scott Ritchie's Schlüssel</a></b> auf deinen Desktop. Öffne dann den -<b>Authentifizierung</b>-Reiter, klicke <b>Schlüsseldatei importieren</b> und wähle die -Schlüsseldatei, die du gerade gespeichert hast (<i>Scott Ritchie.gpg</i>). Es ist sicher, -diese Datei nach diesem Schritt zu löschen.</p> +und speichere Scott Ritchie's Schlüssel</a></b> (Rechtsklick -> Speichern unter...) +auf deinen Desktop. Öffne dann den <b>Authentifizierung</b>-Reiter, +klicke<b>Schlüsseldatei importieren</b> und wähle die Schlüsseldatei, +die du gerade gespeichert hast (<i>Scott Ritchie.gpg</i>). Es ist sicher, diese Datei nach +diesem Schritt zu löschen.</p> <img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="686" height="514" alt="System->Systemverwaltung->Software-Paketquellen" border="0">

1 0

Christoph Korn : German template sync.
by Jeremy Newman 13 Feb '09

13 Feb '09

Module: website Branch: master Commit: f1c9df8d23a45aeee07219c70189248cc223ef8c URL: http://source.winehq.org/git/website.git/?a=commit;h=f1c9df8d23a45aeee07219… Author: Christoph Korn <c_korn(a)gmx.de> Date: Fri Feb 13 01:20:36 2009 +0100 German template sync. >From f9599b91ab30b75126869c4b79f0cebf73f7a487 Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Fri, 13 Feb 2009 01:06:49 +0100 Subject: German template sync: Trim download page to reduce vertical scroll --- templates/de/download.template | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index b59990e..db9835b 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -37,15 +37,12 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <h2><a name="binary"></a>Wine Binär-Downloads</h2> -<p>Offizielle WineHQ Builds für Linux Red Hat, Mandriva, SUSE, Slackware und FreeBSD, -auf <a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a> gehostet. -Für jede neue Version aktualisiert.</p> - -<p><b>Lies das +<p><table><tr><td>Aktuellste stabile Version:</td><td>Wine {$config_stable_release}</td> +<td rowspan="2"><b>Lies das <a href="http://wiki.winehq.org/HowTo">Installations- und Konfigurations-How-to (en)</a> -für Informationen zu den Schritten, die nach der Installation auszuführen sind.</b></p> +für Informationen zu den Schritten, die nach der Installation auszuführen sind.</b></td></tr> + -<p><table><tr><td>Aktuellste stabile Version:</td><td>Wine {$config_stable_release}</td></tr> <tr><td>Aktuellste Entwicklerversion:</td><td>Wine {$config_master_release}</td></tr></table></p> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -84,15 +81,6 @@ für Informationen zu den Schritten, die nach der Installation auszufüh </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - Quellcode für FreeBSD 5.3 und spätere Versionen</td> - <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> @@ -140,6 +128,15 @@ für Informationen zu den Schritten, die nach der Installation auszufüh </tr> <tr bgcolor="#ffffff"> + <td align="center"><a href="http://www.freshports.org/emulators/wine/"> + <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> + </td> + <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> + Quellcode für FreeBSD 5.3 und spätere Versionen</td> + <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> + </tr> + + <tr bgcolor="#ffffff"> <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td>

1 0