December 2015 - Wine-Commits

Francois Gouget : po: Fix trailing colon issues in the Czech, Esperanto Japanese and Portuguese (Portugal) translations.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 5efd11a4de6694f06192a8de8e58212fb99fc35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efd11a4de6694f06192a8de8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:30 2015 +0100 po: Fix trailing colon issues in the Czech, Esperanto Japanese and Portuguese (Portugal) translations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/cs.po | 2 +- po/eo.po | 2 +- po/ja.po | 2 +- po/pt_PT.po | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index 81a1d50..8cbf3e3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13900,7 +13900,7 @@ msgstr "Poslední změna:" #: winefile.rc:171 msgid "Cop&yright:" -msgstr "Autorská práva" +msgstr "Autorská práva:" #: winefile.rc:173 msgid "Size:" diff --git a/po/eo.po b/po/eo.po index 562cb51..004cdad 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13451,7 +13451,7 @@ msgstr "" #: winefile.rc:171 msgid "Cop&yright:" -msgstr "Kop&irajto::" +msgstr "Kop&irajto:" #: winefile.rc:173 msgid "Size:" diff --git a/po/ja.po b/po/ja.po index 4b584dd..c7aa4ee 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13583,7 +13583,7 @@ msgstr "コマンド履歴" #: wineconsole.rc:69 msgid "&Buffer size:" -msgstr "バッファサイズ(&B)" +msgstr "バッファサイズ(&B):" #: wineconsole.rc:72 msgid "&Remove duplicates" diff --git a/po/pt_PT.po b/po/pt_PT.po index ff6b5eb..90a7ca8 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2369,7 +2369,7 @@ msgstr "X.509 codificado em &DER (*.cer)" #: cryptui.rc:410 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X509 codificado em Base64 (*.cer)" +msgstr "X509 codificado em Base64 (*.cer):" #: cryptui.rc:412 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2441,7 +2441,7 @@ msgstr "Todos os propósitos deste certificado não foram verificados." #: cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "Este certificado é intencionado com os seguintes propósitos::" +msgstr "Este certificado é intencionado com os seguintes propósitos:" #: cryptui.rc:38 msgid "Issued to: "

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: ffbab96cc6fc486c71a2473ceee76717d84dfc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbab96cc6fc486c71a2473ce… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Dec 7 00:44:55 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 86d59d4..1f56835 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-24 19:33+0100\n" +"PO-Revision-Date: 2015-12-07 00:44+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -9863,7 +9863,7 @@ msgstr "" "\n" "Durch Eingabe von PATH wird die aktuelle PATH-Einstellung angezeigt (der\n" "Initialwert wird aus der Registrierung ausgelesen). Um diese Einstellung zu\n" -"ändern, kann dem PATH-Befehl der neue Wert als Argument übergegeben werden.\n" +"ändern, kann dem PATH-Befehl der neue Wert als Argument übergeben werden.\n" "\n" "Es ist möglich, den Suchpfad mit Hilfe der PATH-Umgebungsvariable zu\n" "modifizieren. Zum Beispiel:\n" @@ -10120,10 +10120,10 @@ msgid "" msgstr "" "SETLOCAL startet die Begrenzung der Gültigkeit von Änderungen.\n" "\n" -"Änderungen der Umgebung nach SETLOCAL sind lokal zur\n" -"Stapelverarbeitungsdatei und werden bis zum nächsten ENDLOCAL vorgehalten\n" -"(oder bis zum Ende der Datei falls dies zuerst kommt). Ab diesem Punkt wirt\n" -"die vorherige Umgebung wiederhergestellt.\n" +"Änderungen der Umgebung nach SETLOCAL sind nur innerhalb der\n" +"Stapelverarbeitungsdatei gültig und werden bis zum nächsten ENDLOCAL\n" +"(oder dem Ende der aktuellen Datei) vorgehalten. Ab diesem Punkt wird die\n" +"vorherige Umgebung wiederhergestellt.\n" #: cmd.rc:275 msgid "" @@ -12157,19 +12157,19 @@ msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "Fehler: Konnte Prozess \"%1\" nicht finden.\n" +msgstr "Fehler: Prozess \"%1\" konnte nicht gefunden werden.\n" #: taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "Fehler: Konnte die Prozessliste nicht enumerieren.\n" +msgstr "Fehler: Die Prozessliste konnte nicht enumeriert werden.\n" #: taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "Fehler: Konnte Prozess \"%1\" nicht beenden.\n" +msgstr "Fehler: Prozess \"%1\" konnte nicht beendet werden.\n" #: taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "Fehler: Eigenen Prozess beenden ist nicht gestattet.\n" +msgstr "Fehler: Selbstterminierung von Prozessen ist nicht gestattet.\n" #: taskmgr.rc:37 taskmgr.rc:108 msgid "&New Task (Run...)"

1 0

Francois Gouget : winecfg: Tweak sizes and alignments so the 'Font' button does not clip in Portuguese (Portugal).
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 9d90c897ce67ce90a7ee6100eee69a75565b70f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d90c897ce67ce90a7ee6100e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 7 12:26:58 2015 +0100 winecfg: Tweak sizes and alignments so the 'Font' button does not clip in Portuguese (Portugal). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 221916b..d30d819 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -288,18 +288,18 @@ BEGIN LTEXT "&Theme:",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 - LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,112,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size:",IDC_THEME_SIZETEXT,135,48,110,8 - COMBOBOX IDC_THEME_SIZECOMBO,135,58,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "It&em:",IDC_STATIC,15,80,112,8 - COMBOBOX IDC_SYSPARAM_COMBO,15,90,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,133,80,25,8,WS_DISABLED - PUSHBUTTON "",IDC_SYSPARAM_COLOR,133,90,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,164,80,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,164,90,33,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 + COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,80,105,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,90,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,80,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,157,90,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13 - PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,200,90,45,13,WS_DISABLED + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,90,55,13,WS_DISABLED GROUPBOX "Folders",IDC_STATIC,8,114,244,100 CONTROL "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64

1 0

Dmitry Timoshkov : winhttp/tests: Fix spurious crashes under Windows.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: fb31a0f7e084d7db4c9e945ecfc38b603ea93a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb31a0f7e084d7db4c9e945ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 7 13:15:53 2015 +0800 winhttp/tests: Fix spurious crashes under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2b460df..c41ff62 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3574,15 +3574,15 @@ static void test_IWinHttpRequest(void) SysFreeString( method ); SysFreeString( url ); - V_VT( &data ) = VT_BSTR; - V_BSTR( &data ) = NULL; - hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); + if (hr == S_OK) + { + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); + } IWinHttpRequest_Release( req );

1 0

Jactry Zeng : riched20/tests: Add return tests for EM_SETTEXTEX.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: d5c587b1c27c967ef744d81603604a506016238e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c587b1c27c967ef744d8160… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Dec 4 15:30:35 2015 +0800 riched20/tests: Add return tests for EM_SETTEXTEX. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 20cc924..efa0b29 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3676,8 +3676,9 @@ static void test_EM_SETTEXTEX(void) setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3692,8 +3693,9 @@ static void test_EM_SETTEXTEX(void) hwndRichEdit = new_richedit(NULL); setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3706,8 +3708,9 @@ static void test_EM_SETTEXTEX(void) * but this time it is because the selection is at the beginning. */ setText.codepage = CP_ACP; setText.flags = ST_DEFAULT; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3724,7 +3727,8 @@ static void test_EM_SETTEXTEX(void) getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3739,7 +3743,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3784,7 +3789,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3797,7 +3803,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3810,7 +3817,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem4_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3825,7 +3833,8 @@ static void test_EM_SETTEXTEX(void) /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3840,7 +3849,8 @@ static void test_EM_SETTEXTEX(void) /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3878,7 +3888,8 @@ static void test_EM_SETTEXTEX(void) getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n");

1 0

Jactry Zeng : riched20/tests: Test EM_SETTEXT and EM_REPLACESEL with multibyte character.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: f52ae0458536e47b8c975e6210fa4664f642ae45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ae0458536e47b8c975e621… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Dec 4 15:30:25 2015 +0800 riched20/tests: Test EM_SETTEXT and EM_REPLACESEL with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 46d93aa..20cc924 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3997,6 +3997,41 @@ static void test_EM_SETTEXTEX(void) result = strcmp(bufACP, "TestUTF8WithBOM"); ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + /* Test multibyte character */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(result == 5, "EM_SETTEXTEX incorrectly returned %d, expected 5\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(result == 4, "EM_SETTEXTEX incorrectly returned %d, expected 4\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + todo_wine ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + } + DestroyWindow(hwndRichEdit); } @@ -4835,6 +4870,34 @@ static void test_EM_REPLACESEL(int redraw) r = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + /* Test with multibyte character */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(r == 5, "EM_REPLACESEL returned %d, expected 5\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(r == 4, "EM_REPLACESEL returned %d, expected 4\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + todo_wine ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + todo_wine ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + } + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r);

1 0

Alistair Leslie-Hughes : configure: Create d3dx10 import library.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 3f38d2a1170e63c9d9d2cbbdbf79bc094a87fe1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f38d2a1170e63c9d9d2cbbdb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 5 10:23:36 2015 +1100 configure: Create d3dx10 import library. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/d3dx10_43/Makefile.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 885a3c5..3787828 100755 --- a/configure +++ b/configure @@ -17451,7 +17451,7 @@ wine_fn_config_dll d3dx10_39 enable_d3dx10_39 wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 -wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx10_43 enable_d3dx10_43 implib d3dx10 wine_fn_config_dll d3dx11_42 enable_d3dx11_42 wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 diff --git a/configure.ac b/configure.ac index 2d2a168..86f12c5 100644 --- a/configure.ac +++ b/configure.ac @@ -2791,7 +2791,7 @@ WINE_CONFIG_DLL(d3dx10_39) WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) -WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10]) WINE_CONFIG_DLL(d3dx11_42) WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 2585f48..cb48f0d 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_43.dll +IMPORTLIB = d3dx10 C_SRCS = \ d3dx10_43_main.c

1 0

Francois Gouget : po: Add a couple of missing ellipses to the Catalan translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 204fd38b096ad6a411f93c25d22ec6ed54d6fcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204fd38b096ad6a411f93c25d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:32:50 2015 +0100 po: Add a couple of missing ellipses to the Catalan translation. Any size issue should be fixed in the dialog using the translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9319822..f43a5c4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3313,10 +3313,10 @@ msgctxt "home page" msgid "Home" msgstr "Inici" -# Including the ellipsis would make this string too long +# FIXME: The ellipsis makes this string too long (or not?) #: ieframe.rc:71 winhlp32.rc:69 msgid "Print..." -msgstr "Imprimeix" +msgstr "Imprimeix..." #: ieframe.rc:76 msgid "Address" @@ -9649,10 +9649,10 @@ msgstr "Ana&lògic" msgid "Digi&tal" msgstr "Digi&tal" -# Including the ellipsis would make this string too long +# FIXME: The ellipsis makes this string too long (or not?) #: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84 msgid "&Font..." -msgstr "T&ipus de lletra" +msgstr "T&ipus de lletra..." #: clock.rc:37 msgid "&Without Titlebar"

1 0

Francois Gouget : po: Remove a superfluous trailing space in a Japanese translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 0f1c79e581ab52a315d4b6ef86448bdd0dc5b56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1c79e581ab52a315d4b6ef8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:24 2015 +0100 po: Remove a superfluous trailing space in a Japanese translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index d8b5cb0..4b584dd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11949,7 +11949,7 @@ msgstr "" " [/s] サイレントモード (一切のメッセージが表示されません)。\n" " [/i] DllInstallを呼び出し、追加の[cmdline]を渡します。\n" "\t[/u]と同時に使った場合、DllInstallはアンインストールモードで呼び出\n" -"\tされます。 \n" +"\tされます。\n" " [/n] DllRegisterServerを呼び出しません。[/i]と一緒に使用してください。\n" "\n"

1 0

Francois Gouget : po: Fix a printf-format specified in the Catalan translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 54f68565841b0cc90a812d1208cbac7bfbc30050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f68565841b0cc90a812d120… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:13 2015 +0100 po: Fix a printf-format specified in the Catalan translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ca.po b/po/ca.po index 410cdd8..9319822 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13016,7 +13016,7 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%s'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" #: uninstaller.rc:32 msgid ""

1 0