December 2014 - Wine-commits

Sebastian Lackner : ws2_32/tests: Fix several copy and paste errors.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: d57ccd54f8d751b57490d5a74c3a81ac31297313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ccd54f8d751b57490d5a74… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 09:55:39 2014 +0100 ws2_32/tests: Fix several copy and paste errors. --- dlls/ws2_32/tests/sock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 106588d..16f98c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3358,14 +3358,14 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n"); FD_ZERO(&readfds); FD_SET(fdRead, &readfds); ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); @@ -3373,7 +3373,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); while(1) { FD_ZERO(&writefds); @@ -3388,7 +3388,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n"); Sleep(100); @@ -3398,7 +3398,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); closesocket(fdRead); closesocket(fdWrite);

1 0

Iván Matellanes : msvcrt: Call the _nolock variant when the file is already locked.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 17fcef507f8c05f2ae45b2b47c091f8e6e6582d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fcef507f8c05f2ae45b2b47… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Nov 28 20:48:31 2014 +0100 msvcrt: Call the _nolock variant when the file is already locked. --- dlls/msvcrt/file.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0f8735..5176f58 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1417,7 +1417,7 @@ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) TRACE(":file (%p) fd (%d)\n",file,file->_file); MSVCRT__lock_file(file); - MSVCRT_fseek(file, 0L, SEEK_SET); + MSVCRT__fseek_nolock(file, 0L, SEEK_SET); MSVCRT_clearerr(file); MSVCRT__unlock_file(file); } @@ -3586,7 +3586,7 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetc(file)) != MSVCRT_EOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetc_nolock(file)) != MSVCRT_EOF && cc != '\n') { *s++ = (char)cc; size --; @@ -3676,7 +3676,7 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) MSVCRT__lock_file(file); for (j=0; j<sizeof(int); j++) { - k = MSVCRT_fgetc(file); + k = MSVCRT__fgetc_nolock(file); if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; MSVCRT__unlock_file(file); @@ -3726,7 +3726,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetwc_nolock(file)) != MSVCRT_WEOF && cc != '\n') { *s++ = cc; size --; @@ -4452,7 +4452,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int ret; MSVCRT__lock_file(file); - ret = MSVCRT_fwrite(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } @@ -4468,14 +4468,14 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__lock_file(file); if (!(get_ioinfo_nolock(file->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { - if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(s[i], file) == MSVCRT_WEOF) { if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; @@ -4512,8 +4512,8 @@ char * CDECL MSVCRT_gets(char *buf) char * buf_start = buf; MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT_fgetc(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT_fgetc(MSVCRT_stdin)) + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; *buf = '\0'; @@ -4532,8 +4532,8 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) MSVCRT_wchar_t* ws = buf; MSVCRT__lock_file(MSVCRT_stdin); - for (cc = MSVCRT_fgetwc(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; - cc = MSVCRT_fgetwc(MSVCRT_stdin)) + for (cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; + cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin)) { if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; @@ -4578,12 +4578,12 @@ int CDECL MSVCRT_puts(const char *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4598,12 +4598,12 @@ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4671,7 +4671,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s MSVCRT__lock_file(file); - MSVCRT_fflush(file); + MSVCRT__fflush_nolock(file); if(file->_flag & MSVCRT__IOMYBUF) MSVCRT_free(file->_base); file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF); @@ -4823,13 +4823,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) MSVCRT__lock_file(file); if(!(get_ioinfo_nolock(((MSVCRT_FILE*)file)->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + ret = MSVCRT__fwrite_nolock(str, sizeof(MSVCRT_wchar_t), len, file); MSVCRT__unlock_file(file); return ret; } for(i=0; i<len; i++) { - if(MSVCRT_fputwc(str[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(str[i], file) == MSVCRT_WEOF) { MSVCRT__unlock_file(file); return -1; }

1 0

Jacek Caban : mshtml: Added "indent" command support to execCommand.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 71cb0cea7442440cc9ea3cf142255e9c261c01a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cb0cea7442440cc9ea3cf14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 12:55:34 2014 +0100 mshtml: Added "indent" command support to execCommand. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index edc91e6..7a577d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1098,6 +1098,8 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; +static const WCHAR indentW[] = + {'i','n','d','e','n','t',0}; static const WCHAR insertorderedlistW[] = {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; static const WCHAR insertunorderedlistW[] = @@ -1112,6 +1114,7 @@ static const struct { OLECMDID id; }command_names[] = { {fontnameW, IDM_FONTNAME}, + {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST}, {outdentW, IDM_OUTDENT},

1 0

Jacek Caban : mshtml: Added support for flag 2 in getAttribute.
by Alexandre Julliard 01 Dec '14

01 Dec '14

Module: wine Branch: master Commit: 1454e302a80c218343420a7402da4d6e2dec4c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1454e302a80c218343420a740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 12:55:51 2014 +0100 mshtml: Added support for flag 2 in getAttribute. --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 48fff3f..f81ccee 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -606,6 +606,10 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { @@ -618,7 +622,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - (lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); + (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -647,8 +651,11 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) + FIXME("Unsuported flags %x\n", lFlags); + hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { V_VT(AttributeValue) = VT_NULL; return S_OK; @@ -659,8 +666,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); + if(FAILED(hres)) + return hres; + + if(lFlags & ATTRFLAG_ASSTRING) { + switch(V_VT(AttributeValue)) { + case VT_BSTR: + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(AttributeValue)); + V_VT(AttributeValue) = VT_BSTR; + V_BSTR(AttributeValue) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(AttributeValue, AttributeValue, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, @@ -673,7 +700,7 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { *pfSuccess = VARIANT_FALSE; return S_OK; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 39cdae5..2b3634e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -148,12 +148,16 @@ function test_attrs() { x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", "display: none"); x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); ok(s.display === "", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); s.display = "none"; ok(s.cssText != "", "s.cssText = " + s.cssText); @@ -163,6 +167,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.cssText != "", "s.cssText = " + s.cssText); ok(s.display === "none", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", null); x = input.getAttribute("style"); @@ -173,11 +179,15 @@ function test_attrs() { x = input.getAttribute("fireEvent"); ok(x === input.fireEvent, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "", "getAttribute('fireEvent') = " + x); input.setAttribute("fireEvent", 3); ok(input.fireEvent === 3, "input.fireEvent = " + input.fireEvent); x = input.getAttribute("fireEvent"); ok(x === 3, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "3", "getAttribute('fireEvent') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed"); @@ -186,6 +196,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.display === "", "s.display = " + s.display); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed");

1 0

Julian Rüger : German translation for release 1.7.32
by Jeremy Newman 01 Dec '14

01 Dec '14

Module: website Branch: master Commit: 2a1800a85b2bde580f06b9aa52af92700cf8d7ce URL: http://source.winehq.org/git/website.git/?a=commit;h=2a1800a85b2bde580f06b9… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Nov 29 00:02:12 2014 +0100 German translation for release 1.7.32 --- news/de/2014112801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014112801.xml b/news/de/2014112801.xml new file mode 100644 index 0000000..2788f50 --- /dev/null +++ b/news/de/2014112801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. November 2014</date> +<title>Wine 1.7.32 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.32 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.32">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine.</li> + <li>Einige zusätzlich implementierte Funktionen in MSHTML.</li> + <li>Verbesserte Unterstützung für die Wiederherstellung von Anzeigemodi.</li> + <li>Weitere Verbesserung der Schriftarteigenschaften in DirectWrite.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.32.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.32
by Jeremy Newman 01 Dec '14

01 Dec '14

Module: website Branch: master Commit: f06ef239968471eab251aabf92427073cec2f588 URL: http://source.winehq.org/git/website.git/?a=commit;h=f06ef239968471eab251aa… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 29 06:48:31 2014 +0100 Polish translation for release 1.7.32 --- news/pl/2014112801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014112801.xml b/news/pl/2014112801.xml new file mode 100644 index 0000000..df6b63d --- /dev/null +++ b/news/pl/2014112801.xml @@ -0,0 +1,16 @@ +<news> +<date>Listopad 28, 2014</date> +<title>Wydano Wine 1.7.32</title> +<body> + Wydanie rozwojowe Wine 1.7.32 jest już dostępne. + <a href="{$root}/announce/1.7.32">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Mono.</li> + <li>Zaimplementowano więcej funkcji w MSHTML.</li> + <li>Ulepszono przywracanie trybu wyświetlania.</li> + <li>Ulepszono kroje czcionek w DirectWrite.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.32.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Update Polish download.template
by Jeremy Newman 01 Dec '14

01 Dec '14

Module: website Branch: master Commit: 7a0e14dda32e61c8a38c57d5360600c75cf73363 URL: http://source.winehq.org/git/website.git/?a=commit;h=7a0e14dda32e61c8a38c57… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 29 07:58:42 2014 +0100 Update Polish download.template --- templates/pl/download.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/pl/download.template b/templates/pl/download.template index f3a4d00..bbab5db 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -60,7 +60,7 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Pobierz paczki dla Ubuntu</a> - - binarne i źródłowe paczki .deb dla Ubuntu Precise (12.04), Quantal (12.10), i Raring (13.04) + - binarne i źródłowe paczki .deb dla Ubuntu Trusty (14.04 LTS)</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -120,7 +120,7 @@ <h2 style="margin-bottom: 10px;"><a name="binary"></a>Aplikacje osób trzecich</h2> -zasami pewne modyfikacje Wine mogą sprawić, +Czasami pewne zmiany Wine mogą sprawić, że aplikacja będzie działać, ale z pewnych powodów zmiany te nie mogą być wcielone do Wine. Stworzono różne aplikacje (tzw. aplikacje osób trzecich), aby pomóc przezwyciężyć niedobory w

1 0

Łukasz Wojniłowicz : Update Polish ubuntu.template
by Jeremy Newman 01 Dec '14

01 Dec '14

Module: website Branch: master Commit: a2fc4cb2587073055e37173badc61c391ce67131 URL: http://source.winehq.org/git/website.git/?a=commit;h=a2fc4cb2587073055e3717… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 29 07:58:41 2014 +0100 Update Polish ubuntu.template --- templates/pl/download/ubuntu.template | 49 ++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index ca9660a..3ea93d4 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -1,5 +1,5 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Wine dla Ubuntu i jego pochodnych @@ -11,52 +11,53 @@ zawiera stabilne wydania. Najnowsze paczki Wine znajdują się na WineHQ. Aby z nich skorzystać wykonaj poniższe instrukcje. +Pochodne Ubuntu: Te paczki i instrukcje są zostały opracowane dla Ubuntu oraz jego <a href="http://wiki.ubuntu.com/UbuntuFlavors">uznawanych odmian</a>. Użytkownicy systemów pochodnych do Ubuntu mogą używać tych paczek, lecz powinni być świadomi, że problemy wywołane różnicami pomiędzy pochodnym distro, a Ubuntu nie są ani błędami Wine, ani błędami pakowania i powinny być zgłaszane do distro, na którym ten problem występuje. + <h2>Dodawanie repozytorium WineHQ PPA:</h2> Otwórz źródła oprogramowania z menu Aplikacje->Centrum Oprogramowania Ubuntu, następnie zaznacz Edycja->Źródła oprogramowania. Przejdź na zakładkę Oprogramowanie osób trzecich i kliknij Dodaj.... -<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> -Następnie, wklej poniższą linijkę. +Następnie, wklej poniższy wiersz. ppa:ubuntu-wine/ppa <h2>Uwaga: paczki beta</h2> -Te paczki są paczkami beta. Oznacza to, że będą -okresowo cierpieć z powodu +Paczki 1.7 są paczkami beta. Oznacza to, że będą +okresowo cierpieć z powodu <a href="http://wiki.winehq.org/RegressionTesting">regresji</a>, a aktualizacja do nich -może popsuć funkcjonalność Wine. Jeżeli wersja stabilna {$config_stable_release} działa bez problemu -to instalowanie tych paczek może nie być konieczne. +może popsuć funkcjonalność Wine. Jeżeli wersja stabilna Wine {$config_stable_release} działa bez problemu +to wgrywanie tych paczek może nie być konieczne. -<h2>Instalowanie Wine:</h2> +<h2>Wgrywanie Wine:</h2> -Skoro już dodałeś/aś repozytorium WineHQ PPA to jesteś gotowy/a do instalacji. +Skoro już dodałeś/aś repozytorium WineHQ PPA to jesteś gotowy/a do wgrywania. -Aby używać najnowszego Wine 1.5 beta, -<a href="apt://wine1.5">kliknij na ten link, aby zainstalować paczkę wine1.5</a>. -Aby używać ostatniej stabilnej wersji Wine 1.4, -<a href="apt://wine1.4">kliknij na ten link, aby zainstalować paczkę wine1.4</a>. +Aby używać najnowszego Wine {$config_master_release}, +<a href="apt://wine1.7">naciśnij na to dowiazanie, aby wgrać paczkę wine1.7</a>. +Aby używać ostatniej stabilnej wersji Wine {$config_stable_release}, +<a href="apt://wine1.6">naciśnij na to dowiazanie, aby wgrać paczkę wine1.6</a>. -<h2>Aktualizacja do nowej wersji Ubuntu</h2> +<h2>Unowocześnienie do nowej wersji Ubuntu</h2> -Jeżeli aktualizujesz cały system np. przechodzisz z -Ubuntu 10.04 na 10.10, to będziesz musiał/a wrócić do tej strony i -dodać repozytorium do nowej wersji systemu. Wbudowany menadżer -aktualizacji nie zmieni automatycznie repozytorium Wine. +Jeżeli unowocześniasz cały system np. przechodzisz z +Ubuntu 13.10 na 14.04, to będziesz musiał/a wrócić do tej strony i +dodać repozytorium do nowej wersji systemu. Wbudowany program do zarządzania uaktualnieniami sam nie zmieni repozytorium Wine. -<h2>Alternatywne komendy wiersza poleceń do zainstalowania Wine:</h2> +<h2>Alternatywne polecenia wiersza poleceń do wgrana Wine:</h2> -Istnieje możliwość dodania repozytoriów Wine i instalowania z wiersza poleceń. +Istnieje możliwość dodania repozytoriów Wine i wgrywanie z wiersza poleceń. Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu. sudo add-apt-repository ppa:ubuntu-wine/ppa Następnie zaktualizuj informacje o paczkach APT wpisując 'sudo apt-get -update'. Teraz możesz zainstalować Wine wpisując w terminalu 'sudo apt-get -install wine1.5'. +update'. Teraz możesz wgrać Wine wpisując w terminalu 'sudo apt-get +install wine1.7'. -Jeżeli chciałbyś ręcznie przeglądać PPA, możesz odwiedzić <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">jego stronę na Launchpad</a>. +Aby ręcznie ręcznie przeglądać PPA, odwiedź <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">jego stronę na Launchpad</a>.

1 0

Frédéric Delanoy : French translation for release 1.7.32
by Jeremy Newman 01 Dec '14

01 Dec '14

Module: website Branch: master Commit: b9dda3b534bba3f8cc4a2d0cfbca4ee6310809d1 URL: http://source.winehq.org/git/website.git/?a=commit;h=b9dda3b534bba3f8cc4a2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 29 09:17:25 2014 +0100 French translation for release 1.7.32 --- news/fr/2014112801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014112801.xml b/news/fr/2014112801.xml new file mode 100644 index 0000000..cc7f405 --- /dev/null +++ b/news/fr/2014112801.xml @@ -0,0 +1,15 @@ +<news> +<date>28 novembre 2014</date> +<title>Sortie de Wine 1.7.32</title> +<body> + La version de développement 1.7.32 de Wine est disponible. + <a href="{$root}/announce/1.7.32">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Mono.</li> + <li>Quelques fonctions supplémentaires implémentées dans MSHTML.</li> + <li>Meilleure prise en charge de la restauration du mode d'affichage.</li> + <li>Améliorations dans les métriques de polices dans DirectWrite.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.32.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