December 2013 - Wine-commits

Michael Stefaniuc : dmusic: These COM classes don't support COM aggregation .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 5f5c21e55d3277964214c7b4d0227817246d78c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c21e55d3277964214c7b4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 28 23:34:11 2013 +0100 dmusic: These COM classes don't support COM aggregation. --- dlls/dmusic/collection.c | 13 ++++++++----- dlls/dmusic/dmusic.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index e30f89d..f98bc19 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -814,12 +814,15 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; - + + *ppobj = NULL; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCollectionImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + if (!obj) + return E_OUTOFMEMORY; + obj->IDirectMusicCollection_iface.lpVtbl = &DirectMusicCollection_Collection_Vtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicCollection_Object_Vtbl; obj->IPersistStream_iface.lpVtbl = &DirectMusicCollection_PersistStream_Vtbl; diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 0c2584f..6c837f7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -408,6 +408,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); *ret_iface = NULL; + if (unkouter) + return CLASS_E_NOAGGREGATION; dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); if (!dmusic)

1 0

Michael Stefaniuc : dmusic/tests: Centralize the skip().
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 645ca7504ee60fe029bb4df7e749deb23975d5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ca7504ee60fe029bb4df7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:36:28 2013 +0100 dmusic/tests: Centralize the skip(). --- dlls/dmusic/tests/dmusic.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 3174685..9cc9023 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -62,11 +62,7 @@ static void test_dmusic(void) IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); @@ -149,11 +145,7 @@ static void test_dmbuffer(void) LPBYTE data; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); desc.dwSize = sizeof(DMUS_BUFFERDESC); desc.dwFlags = 0; @@ -230,10 +222,25 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static BOOL missing_dmusic(void) +{ + IDirectMusic8 *dm; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dm); + + return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmusic()) + { + skip("DirectMusic not available\n"); + CoUninitialize(); + return; + } test_dmusic(); test_dmbuffer();

1 0

Michael Stefaniuc : dmusic/tests: Add some COM tests for IDirectMusic/ IDirectMusicCollection.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 0c4b3514a548e1f0b87834ce97b30b6b3929bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4b3514a548e1f0b87834ce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:38:06 2013 +0100 dmusic/tests: Add some COM tests for IDirectMusic/IDirectMusicCollection. --- dlls/dmusic/tests/dmusic.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 9cc9023..c425840 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -222,6 +222,99 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static void test_COM(void) +{ + IDirectMusic8 *dm8 = (IDirectMusic8*)0xdeadbeef; + IDirectMusic *dm; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dm8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dm8, "dm8 = %p\n", dm8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dm8); + ok(hr == E_NOINTERFACE, "DirectMusic8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for DirectMusic and DirectMusic8 */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void**)&dm8); + ok(hr == S_OK, "DirectMusic8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusic8_AddRef(dm8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IDirectMusic, (void**)&dm); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %08x\n", hr); + refcount = IDirectMusic_AddRef(dm); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusic_Release(dm); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + while (IDirectMusic8_Release(dm8)); +} + +static void test_COM_dmcoll(void) +{ + IDirectMusicCollection *dmc = (IDirectMusicCollection*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmc); + ok(hr == E_NOINTERFACE, "DirectMusicCollection create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicCollection interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicCollection, (void**)&dmc); + ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicCollection_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + while (IDirectMusicCollection_Release(dmc)); +} + static BOOL missing_dmusic(void) { IDirectMusic8 *dm; @@ -241,6 +334,8 @@ START_TEST(dmusic) CoUninitialize(); return; } + test_COM(); + test_COM_dmcoll(); test_dmusic(); test_dmbuffer();

1 0

Nikolay Sivov : ntdll: Open source file only when needed during context creation.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 031c02726236efaa6470026a2f2687d618b82ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c02726236efaa6470026a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:18 2013 +0400 ntdll: Open source file only when needed during context creation. --- dlls/kernel32/tests/actctx.c | 33 ++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 6 ++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 19bab72..9894568 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2113,14 +2113,41 @@ static void test_CreateActCtx(void) actctx.lpAssemblyDirectory = dir; actctx.lpSource = path; + SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); -todo_wine - ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, - "got handle %p, supposed to fail\n", handle); +todo_wine { + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "got error %d\n", GetLastError()); +} if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); delete_manifest_file("main.manifest"); delete_manifest_file("testdep1.manifest"); + + /* ACTCTX_FLAG_HMODULE_VALID but hModule is not set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID; + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, + "got error %d\n", GetLastError()); + + /* create from HMODULE - resource doesn't exist, lpSource is set */ + memset(&actctx, 0, sizeof(ACTCTXA)); + actctx.cbSize = sizeof(ACTCTXA); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID; + actctx.lpSource = "dummyfile.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(20); + actctx.hModule = GetModuleHandleA(NULL); + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); +todo_wine + ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index bf6e47b..68dd7ec 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4519,7 +4519,10 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } nameW.Buffer = NULL; - if (pActCtx->lpSource) + + /* open file only if it's going to be used */ + if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && + (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) { @@ -4550,7 +4553,6 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) status = get_manifest_in_module( &acl, NULL, NULL, directory, FALSE, pActCtx->hModule, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) - /* FIXME: what to do if pActCtx->lpSource is set */ status = get_manifest_in_associated_manifest( &acl, NULL, NULL, directory, pActCtx->hModule, pActCtx->lpResourceName ); }

1 0

Ken Thomases : winemac: Don' t check the state of the SC_MINIMIZE item of the window menu when asked to minimize .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2c6ad1829d4fe77278dc6f8cc2f496a59fb62849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ad1829d4fe77278dc6f8cc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:07 2013 -0600 winemac: Don't check the state of the SC_MINIMIZE item of the window menu when asked to minimize. The window menu items are not updated as the window state changes; they only update when the menu is shown. So the item state is not a reliable indicator of whether minimization is allowed. --- dlls/winemac.drv/window.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a4e730d..91a1d4d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,7 +2037,6 @@ void macdrv_app_deactivated(void) void macdrv_window_minimize_requested(HWND hwnd) { DWORD style; - HMENU hSysMenu; style = GetWindowLongW(hwnd, GWL_STYLE); if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) @@ -2046,17 +2045,6 @@ void macdrv_window_minimize_requested(HWND hwnd) return; } - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_MINIMIZE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - { - TRACE("not minimizing win %p menu state 0x%08x\n", hwnd, state); - return; - } - } - if (GetActiveWindow() != hwnd) { LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT),

1 0

André Hentschel : German translation update for the Ubuntu download page
by Jeremy Newman 30 Dec '13

30 Dec '13

Module: website Branch: master Commit: 99c49f254e51d66460473eef758538943b5420a8 URL: http://source.winehq.org/git/website.git/?a=commit;h=99c49f254e51d66460473e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 19 23:45:23 2013 +0100 German translation update for the Ubuntu download page --- templates/de/download.template | 2 +- templates/de/download/ubuntu.template | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index e9c63fa..0f93af7 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Precise (12.04), Quantal (12.10), und Raring (13.04) + binär und Quellcode .debs für Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04) und Saucy (13.10) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index de480f9..e77befd 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -26,26 +26,26 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz <h2>Warnung: Betapakete</h2> -Die 1.5 Pakete hier sind Betapakete. Das bedeutet, dass sie +Die 1.7 Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen <a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version -Wine 1.4 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. +Wine 1.6 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. <h2>Installieren von Wine:</h2> Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren. -Für die aktuellste Wine 1.5 Beta, -<a href="apt://wine1.5">klicke diesen Link um das wine1.5 Paket zu installieren</a>. -Für die ältere, stabile Wine 1.4 Version, -<a href="apt://wine1.5">klicke diesen Link um das wine1.4 Paket zu installieren</a>. +Für die aktuellste Wine 1.7 Beta, +<a href="apt://wine1.7">klicke diesen Link um das wine1.7 Paket zu installieren</a>. +Für die ältere, stabile Wine 1.6 Version, +<a href="apt://wine1.6">klicke diesen Link um das wine1.6 Paket zu installieren</a>. <h2>Aktualisierung auf eine neue Ubuntuversion</h2> -Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 10.04 auf -10.10, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. -Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch umschalten. +Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 13.10 auf +14.04, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. +Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch updaten. <h2>Alternative Kommandozeileninstruktionen für die Wine-Installation:</h2> @@ -58,6 +58,6 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</ Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get -install wine1.5' im Terminal installieren. +install wine1.7' im Terminal installieren. Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>.

1 0

Frédéric Delanoy : French translation update for the Ubuntu download page
by Jeremy Newman 30 Dec '13

30 Dec '13

Module: website Branch: master Commit: 672fc65574e8a5b76249b9d37cc2ab9761cd7e9b URL: http://source.winehq.org/git/website.git/?a=commit;h=672fc65574e8a5b76249b9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 20 02:41:00 2013 +0100 French translation update for the Ubuntu download page --- templates/fr/download.template | 2 +- templates/fr/download/ubuntu.template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/fr/download.template b/templates/fr/download.template index 3869fd2..f29700e 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -66,7 +66,7 @@ center;">Voyez la <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Paquets Ubuntu</a> - - .deb binaires et sources pour Ubuntu Precise (12.04), Quantal (12.10), et Raring (13.04) + - .deb binaires et sources pour Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04) et Saucy (13.10) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template index cc20744..09b52de 100644 --- a/templates/fr/download/ubuntu.template +++ b/templates/fr/download/ubuntu.template @@ -27,7 +27,7 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0 <h2>Avertissement : paquets bêta</h2> -Les paquets 1.5 sont des paquets bêta, c.-à-d. qu'ils +Les paquets 1.7 sont des paquets bêta, c.-à-d. qu'ils peuvent à l'occasion souffrir de <a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.4 @@ -39,15 +39,15 @@ de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta Une fois le dépôt PPA de WineHQ ajouté, l'installation peut se poursuivre. -Pour la version bêta 1.5 la plus récente, -<a href="apt://wine1.5">utilisez ce lien pour installer le paquet wine1.5</a>. -Pour la version stable 1.4 (plus ancienne) -<a href="apt://wine1.4">utilisez ce lien pour installer le paquet wine1.4</a>. +Pour la version bêta 1.7 la plus récente, +<a href="apt://wine1.7">utilisez ce lien pour installer le paquet wine1.7</a>. +Pour la version stable 1.6 (plus ancienne) +<a href="apt://wine1.6">utilisez ce lien pour installer le paquet wine1.6</a>. <h2>Mise à niveau vers une nouvelle version d'Ubuntu</h2> Si vous mettez à niveau le système entier, par exemple en passant d'Ubuntu -10.04 à 10.10, vous devrez revenir sur cette page et ré-ajouter le dépôt. Le +13.10 à 14.04, vous devrez revenir sur cette page et ré-ajouter le dépôt. Le gestionnaire de mises à jour intégré n'utilisera pas automatiquement le dépôt Wine. @@ -62,6 +62,6 @@ Kubuntu, Xubuntu ou d'autres distributions dérivées. Mettez ensuite à jour les informations sur les paquets d'APT en exécutant « sudo apt-get update ». Vous pouvez dès lors installer Wine en tapant - « sudo apt-get install wine1.5 ». + « sudo apt-get install wine1.7 ». Si vous voulez parcourir manuellement le PPA, vous pouvez <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visiter sa page Launchpad</a>.

1 0

刘涛 : website: Update Simplified Chinese translation for download page
by Jeremy Newman 30 Dec '13

30 Dec '13

Module: website Branch: master Commit: 963dea61095c8113b9c6cd25ffd0016bd094eccb URL: http://source.winehq.org/git/website.git/?a=commit;h=963dea61095c8113b9c6cd… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Dec 20 16:58:50 2013 +0800 website: Update Simplified Chinese translation for download page --- templates/zh-cn/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 80f46fe..2cbdee1 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux"border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a> - - Ubuntu Oneiric（11.10），和 Precise（12.04）的二进制和源码 .debs + - Ubuntu Oneiric（11.10), Precise（12.04）和 Saucy（13.10）的二进制和源码 .debs <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

刘涛 : website: Update Simplified Chinese translation for ubuntu download page
by Jeremy Newman 30 Dec '13

30 Dec '13

Module: website Branch: master Commit: a3796add2e637480ef1d58d11833992d550924b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=a3796add2e637480ef1d58… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Dec 20 17:01:01 2013 +0800 website: Update Simplified Chinese translation for ubuntu download page --- templates/zh-cn/download/ubuntu.template | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/zh-cn/download/ubuntu.template b/templates/zh-cn/download/ubuntu.template index fd150d4..84722db 100644 --- a/templates/zh-cn/download/ubuntu.template +++ b/templates/zh-cn/download/ubuntu.template @@ -22,21 +22,21 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 <h2>警告：Beta 版安装包</h2> -版本 1.5 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。 -所以，如果稳定版的 Wine 1.4 已经能够为你工作，你或许不太想用 beta 版的安装包。 +版本 1.7 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">退化（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。 +所以，如果稳定版的 Wine 1.6 已经能够为你工作，你或许不太想用 beta 版的安装包。 <h2>安装 Wine：</h2> 一旦你已经添加了 WineHQ PPA 源，你就已经可以开始安装了。 -获取最新的 Wine 1.5 beta， -<a href="apt://wine1.5">点击这个链接来安装 wine1.5 的安装包</a>。 -安装旧版但稳定的 Wine 1.4， -<a href="apt://wine1.4">点击这个链接来安装 wine1.4 的安装包</a>。 +获取最新的 Wine 1.7 beta， +<a href="apt://wine1.7">点击这个链接来安装 wine1.7 的安装包</a>。 +安装旧版但稳定的 Wine 1.6， +<a href="apt://wine1.6">点击这个链接来安装 wine1.6 的安装包</a>。 <h2>更新 Ubuntu 到一个新的版本</h2> -如果你更新了整个系统，比如从 Ubuntu 11.10 到 12.04，你需要回到这个页面并重新添加软件源。内置的更新管理器是不会自动开启 Wine 源的。 +如果你更新了整个系统，比如从 Ubuntu 13.10 到 14.04，你需要回到这个页面并重新添加软件源。内置的更新管理器是不会自动开启 Wine 源的。 <h2>使用命令行来安装 Wine：</h2> @@ -46,6 +46,6 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 接着运行 ‘sudo apt-get update’ 来更新 APT 的包信息。现在你就可以使用 ‘sudo apt-get -install wine1.5’ 来安装 Wine 了。 +install wine1.7’ 来安装 Wine 了。 如果你想亲自浏览 PPA，可以<a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">访问它的 Launchpad 页面</a>。

1 0

Andrey Gusev : Ukrainian translation update for Ubuntu download page
by Jeremy Newman 30 Dec '13

30 Dec '13

Module: website Branch: master Commit: 50d439dc12f0c1608637edfa89c45a9fc8b94e29 URL: http://source.winehq.org/git/website.git/?a=commit;h=50d439dc12f0c1608637ed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 20 11:44:52 2013 +0200 Ukrainian translation update for Ubuntu download page --- templates/uk/download/ubuntu.template | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/uk/download/ubuntu.template b/templates/uk/download/ubuntu.template index 3097267..f346996 100644 --- a/templates/uk/download/ubuntu.template +++ b/templates/uk/download/ubuntu.template @@ -24,22 +24,22 @@ Software tab and click Add. <h2>Попередження: Розробницькі пакунки</h2> -Пакунки версії 1.5 це розробницькі пакунки. Це означає, що вони періодично можуть містити +Пакунки версії 1.7 це розробницькі пакунки. Це означає, що вони періодично можуть містити <a href="http://wiki.winehq.org/Regression">регресії</a>, і в разі оновлень може постраждати функціональність. -Якщо версія 1.4 добре працює, тоді ви можете не використовувати ці розробницькі пакунки. +Якщо версія 1.6 добре працює, тоді ви можете не використовувати ці розробницькі пакунки. <h2>Встановлення Wine:</h2> Після додавання репозиторія WineHQ PPA, ви готові до встановлення Wine. -Щоб встановити найсвіжішу розробницьку версію Wine 1.5, -<a href="apt://wine1.5">клікніть на це посилання</a>. -Щоб встановити стабільну версію Wine 1.4, -<a href="apt://wine1.4">клікніть на це посилання</a>. +Щоб встановити найсвіжішу розробницьку версію Wine 1.7, +<a href="apt://wine1.7">клікніть на це посилання</a>. +Щоб встановити стабільну версію Wine 1.6, +<a href="apt://wine1.6">клікніть на це посилання</a>. <h2>Оновлення до нової версії Ubuntu</h2> -Якщо ви оновили систему з Ubuntu 11.10 до 12.04, вам потрібно знову додати репозиторій. +Якщо ви оновили систему з Ubuntu 13.10 до 14.04, вам потрібно знову додати репозиторій. Вбудований менеджер оновлень не перемикає репозиторій Wine автоматично. @@ -52,6 +52,6 @@ Kubuntu, Xubuntu та інших дистрибутивах Ubuntu. Потім оновіть APT запустивши команду 'sudo apt-get update'. Тепер ви можете встановити Wine набравши команду 'sudo apt-get -install wine1.5'. +install wine1.7'. Якщо ви хочете подивитися репозиторій власноруч, перейдіть на <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">сторінку у Launchpad</a>.

1 0