February 2012 - Wine-Commits

Ilia Mirkin : po: Fix ENTER -> Enter, CMD help text, remove fuzzy annotations.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: ca78ece0cbe0c9bd0a61169865777c1fba786bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca78ece0cbe0c9bd0a6116986… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Sun Feb 26 13:47:56 2012 -0500 po: Fix ENTER -> Enter, CMD help text, remove fuzzy annotations. --- po/ru.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 7a802f7..2c4c1b7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9767,7 +9767,6 @@ msgstr "" "в операционную систему или оболочку из которой был запущен cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9813,6 +9812,7 @@ msgstr "" "ATTRIB\t\tПоказывает или изменяет DOS-атрибуты файла\n" "CALL\t\tВызывает один bat-файл из другого\n" "CD (CHDIR)\tИзменяет текущий каталог\n" +"CHOICE\t\tЖдёт выбора из списка\n" "CLS\t\tОчищает экран консоли\n" "COPY\t\tКопирует файл(ы)\n" "CTTY\t\tИзменяет устройство ввода/вывода\n" @@ -9827,14 +9827,16 @@ msgstr "" "MORE\t\tВыводит данные по страницам\n" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" +"PAUSE\t\tОстанавливает исполнение bat-файлa\n" "POPD\t\tВосстанавливает предыдущий текущий каталог, сохранённый с помощью " -"PUSHD\n" "PROMPT\t\tИзменяет приглашение командной строки\n" "PUSHD\t\tСохраняет текущий каталог и переходит в другой\n" "REN (RENAME)\tПереименовывает файл\n" "RD (RMDIR)\tУдаляет каталог\n" "SET\t\tПоказывает или изменяет переменные окружения\n" "SETLOCAL\tНачинает действие локальных изменений окружения\n" +"START\t\tЗапускает программу, или открывает файл в соответствующей " +"программе\n" "TIME\t\tПоказывает или изменяет текущее системное время\n" "TITLE\t\tУстанавливает заголовок окна cmd для текущей сессии\n" "TYPE\t\tВыводит содержимое текстового файла\n" @@ -9958,9 +9960,8 @@ msgstr "" "\n" #: cmd.rc:335 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Метка диска (11 символов, ENTER для ввода пустой метки)?" +msgstr "Метка диска (11 символов, <Enter> для ввода пустой метки)?" #: cmd.rc:336 msgid "PATH not found\n" @@ -14054,7 +14055,6 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Неверный параметр '%1' - воспользуйтесь 'xcopy /?'\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" msgstr "Нажмите клавишу <Enter>, чтобы начать копирование\n"

1 0

Ilia Mirkin : po: Fix typo in Russian translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 7cddfd99c46449cef25114074304b24437a0e48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cddfd99c46449cef25114074… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Sun Feb 26 13:47:55 2012 -0500 po: Fix typo in Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index dbf2c44..7a802f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10030,7 +10030,7 @@ msgstr "Ошибка: неверная опция '%c'.\n" msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "Ошибка: с помощью hostname невозможно измененить имя машины.\n" +msgstr "Ошибка: с помощью hostname невозможно изменить имя машины.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Ivan Vojtko : po: Update Slovak translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 13ba170da09117667bc7ed721118d55686d3b855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ba170da09117667bc7ed721… Author: Ivan Vojtko <ivan.vojtko(a)gmail.com> Date: Sat Feb 25 11:59:14 2012 +0100 po: Update Slovak translation. --- po/sk.po | 364 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 186 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13ba170da09117667bc7e…

1 0

Milan Ševčík : po: Updating Czech translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 518d243ca0b9586a29280804909afc2d22356395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518d243ca0b9586a292808049… Author: Milan Ševčík <sevcik.milan(a)linuxclan.org> Date: Sun Feb 26 09:40:06 2012 +0100 po: Updating Czech translation. --- po/cs.po | 179 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 74 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=518d243ca0b9586a29280…

1 0

Nikolay Sivov : msxml3: Properly escape character data in text nodes.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 5016f7ba4a36265bd1bff3e5abe81213ed5c6ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5016f7ba4a36265bd1bff3e5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 23:20:48 2012 +0300 msxml3: Properly escape character data in text nodes. --- dlls/msxml3/mxwriter.c | 41 ++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 70 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cb1a67f..72db31d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -68,6 +68,12 @@ typedef enum MXWriter_LastProp } mxwriter_prop; +typedef enum +{ + EscapeValue, + EscapeText +} escape_mode; + typedef struct { char *data; @@ -94,6 +100,7 @@ typedef struct VARIANT_BOOL props[MXWriter_LastProp]; BOOL prop_changed; + BOOL cdata; BSTR version; @@ -275,7 +282,7 @@ static void close_output_buffer(mxwriter *This) '"' -> """ '>' -> ">" */ -static WCHAR *get_escaped_string(const WCHAR *str, int *len) +static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) { static const WCHAR ltW[] = {'&','l','t',';'}; static const WCHAR ampW[] = {'&','a','m','p',';'}; @@ -311,14 +318,18 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) memcpy(ptr, ampW, sizeof(ampW)); ptr += sizeof(ampW)/sizeof(WCHAR); break; - case '"': - memcpy(ptr, equotW, sizeof(equotW)); - ptr += sizeof(equotW)/sizeof(WCHAR); - break; case '>': memcpy(ptr, gtW, sizeof(gtW)); ptr += sizeof(gtW)/sizeof(WCHAR); break; + case '"': + if (mode == EscapeValue) + { + memcpy(ptr, equotW, sizeof(equotW)); + ptr += sizeof(equotW)/sizeof(WCHAR); + break; + } + /* fallthrough for text mode */ default: *ptr++ = *str; break; @@ -429,6 +440,7 @@ static inline HRESULT flush_output_buffer(mxwriter *This) { close_element_starttag(This); set_element_name(This, NULL, 0); + This->cdata = FALSE; return write_data_to_stream(This); } @@ -978,7 +990,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - escaped = get_escaped_string(str, &len); + escaped = get_escaped_string(str, EscapeValue, &len); write_output_buffer_quoted(This->buffer, escaped, len); heap_free(escaped); } @@ -1040,7 +1052,19 @@ static HRESULT WINAPI SAXContentHandler_characters( set_element_name(This, NULL, 0); if (nchars) - write_output_buffer(This->buffer, chars, nchars); + { + if (This->cdata) + write_output_buffer(This->buffer, chars, nchars); + else + { + int len = nchars; + WCHAR *escaped; + + escaped = get_escaped_string(chars, EscapeText, &len); + write_output_buffer(This->buffer, escaped, len); + heap_free(escaped); + } + } return S_OK; } @@ -1203,6 +1227,7 @@ static HRESULT WINAPI SAXLexicalHandler_startCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); + This->cdata = TRUE; return S_OK; } @@ -1215,6 +1240,7 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); + This->cdata = FALSE; return S_OK; } @@ -1296,6 +1322,7 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) This->xml_enc = XmlEncoding_UTF16; This->element = NULL; + This->cdata = FALSE; This->dest = NULL; This->dest_written = 0; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cfead73..74afc67 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2439,13 +2439,29 @@ static void test_mxwriter_startendelement(void) free_bstrs(); } +struct writer_characters_t { + const GUID *clsid; + const char *data; + const char *output; +}; + +static const struct writer_characters_t writer_characters[] = { + { &CLSID_MXXMLWriter, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter30, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter40, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter60, "< > & \"", "< > & \"" }, + { NULL } +}; + static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + const struct writer_characters_t *table = writer_characters; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; HRESULT hr; + int i = 0; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2515,6 +2531,54 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* batch tests */ + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, _bstr_(table->data), strlen(table->data)); + EXPECT_HR(hr, S_OK); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + table++; + i++; + } + free_bstrs(); } @@ -2975,6 +3039,10 @@ static void test_mxwriter_cdata(void) hr = ISAXLexicalHandler_startCDATA(lexical); EXPECT_HR(hr, S_OK); + /* all these are escaped for text nodes */ + hr = ISAXContentHandler_characters(content, _bstr_("< > & \""), 7); + EXPECT_HR(hr, S_OK); + hr = ISAXLexicalHandler_endCDATA(lexical); EXPECT_HR(hr, S_OK); @@ -2982,7 +3050,7 @@ static void test_mxwriter_cdata(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[< > & \"]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content);

1 0

Vincent Povirk : shell32: Properly double-null-terminate the filter in the run/browse dialog.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: dd65da7dcec388036f875c91ed8197368001ab7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd65da7dcec388036f875c91e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Feb 26 13:05:00 2012 -0600 shell32: Properly double-null-terminate the filter in the run/browse dialog. --- dlls/shell32/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 84d8799..28a25fd 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -266,7 +266,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_EXE, filter_exe, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER_ALL, filter_all, 256); LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); - snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0 ); + snprintfW( filter, MAX_PATH, filterW, filter_exe, 0, 0, filter_all, 0, 0 ); ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(OPENFILENAMEW);

1 0

Alexandre Julliard : README: Updates.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: b93b90e2919f6b4fd15c553de5b0ce44eea655ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93b90e2919f6b4fd15c553de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 15:38:22 2012 +0100 README: Updates. --- README | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README b/README index baa6ab3..2b3e38f 100644 --- a/README +++ b/README @@ -28,8 +28,8 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: - Linux version 2.0.36 or above - FreeBSD 6.3 or later + Linux version 2.0.36 or later + FreeBSD 7.0 or later Solaris x86 9 or later NetBSD-current Mac OS X 10.4 or later @@ -38,15 +38,9 @@ As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which support kernel threads may be supported in the future. -Linux info: - While Linux 2.2.x should still work and Linux 2.0.x may still work - (older 2.0.x versions had thread-related crashes), - it's best to have a current kernel such as 2.4.x or 2.6.x. - FreeBSD info: - Wine will generally not work properly on versions before FreeBSD - 6.3 or 7.0, and FreeBSD 6.3 has additional patches available. See - http://wiki.freebsd.org/Wine for more information. + Wine will generally not work properly on versions before FreeBSD 7.0. + See http://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -66,8 +60,7 @@ Supported file systems: Wine should run on most file systems. A few compatibility problems have also been reported using files accessed through Samba. Also, NTFS does not provide all the file system features needed by some - applications. Using a native Linux file system such as ext3 is - recommended. + applications. Using a native Unix file system is recommended. Basic requirements: You need to have the X11 development include files installed

1 0

Łukasz Wojniłowicz : news: Put out a call for translators in Polish.
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: d253806ccb5506a1f5d10cc7005fe3160ad4342a URL: http://source.winehq.org/git/website.git/?a=commit;h=d253806ccb5506a1f5d10c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 25 21:00:51 2012 +0100 news: Put out a call for translators in Polish. --- news/pl/2012022001.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012022001.xml b/news/pl/2012022001.xml new file mode 100644 index 0000000..241e4d9 --- /dev/null +++ b/news/pl/2012022001.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 20, 2012</date> +<title>Potrzebni tłumacze!</title> +<body> +Strona stanu tłumaczeń Wine <a href="http://fgouget.free.fr/wine-po/"></a> +pokazuje tylko 12 kompletnych tłumaczeń (przyp. tłum. Polski jest w pełni przetłumaczony). +Chcielibyśmy poprawić się do wersji 1.4. +Szczęśliwie, zaczynając od wersji 1.4 Wine używa plików PO, czyniąc przez +to tłumaczenie łatwiejszym niż poprzednio. Tak więc dowiedz się jak +<a href="http://wiki.winehq.org/Translating">rozpocząć</a> i pomóż nam +uczynić Wine używalnym w twoim kraju. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc5
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: 3265521526f07f66a3f898411ab5ebd6d477e523 URL: http://source.winehq.org/git/website.git/?a=commit;h=3265521526f07f66a3f898… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 25 21:00:52 2012 +0100 Polish translation for release 1.4-rc5 --- news/pl/2012022401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012022401.xml b/news/pl/2012022401.xml new file mode 100644 index 0000000..934ffbd --- /dev/null +++ b/news/pl/2012022401.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 24, 2012</date> +<title>Wydano Wine 1.4-rc5</title> +<body> + Wydanie rozwojowe Wine 1.4-rc5 jest już dostępne. + <a href="{$root}/announce/1.4-rc5">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.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

Frédéric Delanoy : French translation for release 1.4-rc5
by Jeremy Newman Feb. 27, 2012

Feb. 27, 2012

Module: website Branch: master Commit: cccae5d60cbfc474e3fea45495c5baacde9d3911 URL: http://source.winehq.org/git/website.git/?a=commit;h=cccae5d60cbfc474e3fea4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 24 21:17:57 2012 +0100 French translation for release 1.4-rc5 --- news/fr/2012022401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012022401.xml b/news/fr/2012022401.xml new file mode 100644 index 0000000..e9dd929 --- /dev/null +++ b/news/fr/2012022401.xml @@ -0,0 +1,15 @@ +<news> +<date>24 février 2012</date> +<title>Sortie de Wine 1.4-rc5</title> +<body> + La version de développement 1.4-rc5 de Wine est disponible. + <a href="{$root}/announce/1.4-rc5">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.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